PERFORCE change 46320 for review

[Sam Leffler]

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

Change 46320 by sam at sam_ebb on 2004/02/01 12:07:27

	when switching modes reset any desired channel that becomes
	invalidated; otherwise it'll stick and scanning will fail

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#10 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#10 (text+ko) ====

@@ -761,6 +761,12 @@
 		    ("Bad IBSS channel %u",
 		     ieee80211_chan2ieee(ic, ic->ic_ibss_chan)));
 	}
+	/*
+	 * If the desired channel is set but no longer valid then reset it.
+	 */
+	if (ic->ic_des_chan != IEEE80211_CHAN_ANYC &&
+	    isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, ic->ic_des_chan)))
+		ic->ic_des_chan = IEEE80211_CHAN_ANYC;
 
 	/*
 	 * Do 11b/11g mixed-mode state setup.