diff options
| author | sam <sam@FreeBSD.org> | 2009-02-20 21:57:05 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2009-02-20 21:57:05 +0000 |
| commit | 2ac5c35cb50ca644d735bc392b6070f154e65a13 (patch) | |
| tree | 27151402853a92116fce11906c52cafd6e0d9134 | |
| parent | ba5dbdcdd9f2dadb5784e970853a0759f5f0bd12 (diff) | |
| download | FreeBSD-src-2ac5c35cb50ca644d735bc392b6070f154e65a13.zip FreeBSD-src-2ac5c35cb50ca644d735bc392b6070f154e65a13.tar.gz | |
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
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 629fe7e..f870c3c 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -853,7 +853,7 @@ ieee80211_wme_initparams_locked(struct ieee80211vap *vap) 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 ieee80211vap *vap) */ 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); } } |
