svn commit: r299264 - head/sbin/ifconfig

[Andriy Voskoboinyk]

Author: avos
Date: Mon May  9 16:15:52 2016
New Revision: 299264
URL: https://svnweb.freebsd.org/changeset/base/299264

Log:
  ifconfig: fix check for 40 MHz channels while applying country/regdomain.
  
  Do not use 20 MHz channel list while checking 40 MHz channels;
  it may be different. Just use the corresponding list instead.
  
  Tested by:	Masachika ISHIZUKA <ish at amail.plala.or.jp>
  
  PR:		209328

Modified:
  head/sbin/ifconfig/ifieee80211.c

Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c	Mon May  9 16:12:32 2016	(r299263)
+++ head/sbin/ifconfig/ifieee80211.c	Mon May  9 16:15:52 2016	(r299264)
@@ -1984,10 +1984,6 @@ checkchan(const struct ieee80211req_chan
 	 * everything below is to deal with channels that we
 	 * want to include but that are not explicitly listed.
 	 */
-	if (flags & IEEE80211_CHAN_HT40) {
-		/* NB: we use an HT40 channel center that matches HT20 */
-		flags = (flags &~ IEEE80211_CHAN_HT40) | IEEE80211_CHAN_HT20;
-	}
 	if (chanlookup(avail->ic_chans, avail->ic_nchans, freq, flags) != NULL)
 		return 1;
 	if (flags & IEEE80211_CHAN_GSM) {