PERFORCE change 141936 for review

[Sam Leffler]

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

Change 141936 by sam at sam_ebb on 2008/05/20 22:31:10

	don't reset the swbmiss timer in the state machine; it's not
	used in adhoc or wds modes (yet)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#12 edit
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#8 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#12 (text+ko) ====

@@ -115,8 +115,6 @@
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
-	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
-		callout_stop(&vap->iv_swbmiss);
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#8 (text+ko) ====

@@ -403,8 +403,6 @@
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
-	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
-		callout_stop(&vap->iv_swbmiss);
 	error = 0;
 	switch (nstate) {
 	case IEEE80211_S_INIT: