PERFORCE change 77112 for review

[Sam Leffler]

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

Change 77112 by sam at sam_ebb on 2005/05/17 23:31:08

	Fixup tx timeout of mgmt frames in sta mode: don't assert fail
	if this happens while scanning; it shouldn't happen but it's
	ok in that case to just ignore the timeout.  While here add a
	debug msg in case it continues to happen.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#12 edit

Differences ...

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

@@ -1563,9 +1563,13 @@
 {
 	struct ieee80211vap *vap = arg;
 
-	KASSERT((vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0,
-		("mgt frame timeout while scanning?"));
-	if (vap->iv_state != IEEE80211_S_INIT)
+	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
+	    "%s: state %s%s\n", __func__,
+	    ieee80211_state_name[vap->iv_state],
+	    vap->iv_ic->ic_flags & IEEE80211_F_SCAN ? ", scan active" : "");
+
+	if (vap->iv_state != IEEE80211_S_INIT &&
+	    (vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0)
 		ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 }