svn commit: r188864 - head/sys/net80211

[Sam Leffler]

Author: sam
Date: Fri Feb 20 21:57:05 2009
New Revision: 188864
URL: http://svn.freebsd.org/changeset/base/188864

Log:
  o reset aggressive mode flag; it was being left set after marking an
    interface down
  o only allow the first vap to initialize shared wme parameters

Modified:
  head/sys/net80211/ieee80211_proto.c

Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c	Fri Feb 20 21:55:23 2009	(r188863)
+++ head/sys/net80211/ieee80211_proto.c	Fri Feb 20 21:57:05 2009	(r188864)
@@ -853,7 +853,7 @@ ieee80211_wme_initparams_locked(struct i
 
 	IEEE80211_LOCK_ASSERT(ic);
 
-	if ((ic->ic_caps & IEEE80211_C_WME) == 0)
+	if ((ic->ic_caps & IEEE80211_C_WME) == 0 || ic->ic_nrunning > 1)
 		return;
 
 	/*
@@ -905,6 +905,7 @@ ieee80211_wme_initparams_locked(struct i
 		 */
 		wme->wme_hipri_switch_thresh =
 			(HIGH_PRI_SWITCH_THRESH * vap->iv_bss->ni_intval) / 100;
+		wme->wme_flags &= ~WME_F_AGGRMODE;
 		ieee80211_wme_updateparams(vap);
 	}
 }