PERFORCE change 150831 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=150831

Change 150831 by sam at sam_ebb on 2008/10/03 04:32:22

	IFC

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 integrate

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.10 2008/04/20 20:35:44 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.11 2008/09/27 21:18:40 sam Exp $");
 
 /*
  * IEEE 802.11 station scanning support.
@@ -1392,9 +1392,12 @@
 			 */
 			if (vap->iv_des_chan == IEEE80211_CHAN_ANYC ||
 			    IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
-				chan = ieee80211_ht_adjust_channel(vap->iv_ic,
-				    adhoc_pick_channel(ss, 0),
-				    vap->iv_flags_ext);
+				struct ieee80211com *ic = vap->iv_ic;
+
+				chan = adhoc_pick_channel(ss, 0);
+				if (chan != NULL)
+					chan = ieee80211_ht_adjust_channel(ic,
+					    chan, vap->iv_flags_ext);
 			} else
 				chan = vap->iv_des_chan;
 			if (chan != NULL) {