From e115c4ac0db37a521601a924f384faecb15c9602 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 2 Jan 2006 17:16:27 +0000 Subject: enable "aggressive mode" only when operating in ap or station mode; in particular this fixes use of wme in adhoc demo mode, it wasn't possible to set the txop limit because the aggressive mode logic would override Reviewed by: apatti MFC after: 2 weeks --- sys/net80211/ieee80211_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/net80211/ieee80211_proto.c') diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 991a6c2..853ea60 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -739,7 +739,7 @@ ieee80211_wme_updateparams_locked(struct ieee80211com *ic) */ if ((ic->ic_opmode == IEEE80211_M_HOSTAP && (wme->wme_flags & WME_F_AGGRMODE) == 0) || - (ic->ic_opmode != IEEE80211_M_HOSTAP && + (ic->ic_opmode == IEEE80211_M_STA && (ic->ic_bss->ni_flags & IEEE80211_NODE_QOS) == 0) || (ic->ic_flags & IEEE80211_F_WME) == 0) { chanp = &wme->wme_chanParams.cap_wmeParams[WME_AC_BE]; -- cgit v1.1