From ddc5368476b6ba6f8f7ee9830f4626330a12cb3c Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Fri, 1 Feb 2008 21:31:10 +0000 Subject: [PATCH] o correct typo that broke check when handling addba response o add a comment about the ht rates being for 20MHz channels w/ long GI; needs a separate fix after more thought MFC after: 3 days --- sys/net80211/ieee80211_ht.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index aa855a4cfeb2..63fb39a110fd 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #define SM(_v, _f) (((_v) << _f##_S) & _f) /* XXX need max array size */ +/* NB: these are for HT20 w/ long GI */ const int ieee80211_htrates[16] = { 13, /* IFM_IEEE80211_MCS0 */ 26, /* IFM_IEEE80211_MCS1 */ @@ -1348,7 +1349,7 @@ ieee80211_aggr_recv_action(struct ieee80211_node *ni, ac = TID_TO_WME_AC(tid); tap = &ni->ni_tx_ampdu[ac]; - if ((tap->txa_flags & ~IEEE80211_AGGR_XCHGPEND) == 0) { + if ((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0) { IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni->ni_macaddr, "ADDBA response",