diff options
| author | adrian <adrian@FreeBSD.org> | 2016-04-06 01:22:20 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-04-06 01:22:20 +0000 |
| commit | e191826c54c3325354b4888c2932d94c70958753 (patch) | |
| tree | 2f44274afc375fa7dbabacd84a8b8e9121ff12b2 /sys/net80211 | |
| parent | 262c2629ed9fdbc713b277722acfdfd72a057318 (diff) | |
| download | FreeBSD-src-e191826c54c3325354b4888c2932d94c70958753.zip FreeBSD-src-e191826c54c3325354b4888c2932d94c70958753.tar.gz | |
[net80211] missed commit from last one - always cleanup superg state.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_hostap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 1e356dc..4227dfb 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -2078,8 +2078,8 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, } else if (ni->ni_flags & IEEE80211_NODE_HT) ieee80211_ht_node_cleanup(ni); #ifdef IEEE80211_SUPPORT_SUPERG - else if (ni->ni_ath_flags & IEEE80211_NODE_ATH) - ieee80211_ff_node_cleanup(ni); + /* Always do ff node cleanup; for A-MSDU */ + ieee80211_ff_node_cleanup(ni); #endif /* * Allow AMPDU operation only with unencrypted traffic @@ -2097,6 +2097,10 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, "capinfo 0x%x ucastcipher %d", capinfo, rsnparms.rsn_ucastcipher); ieee80211_ht_node_cleanup(ni); +#ifdef IEEE80211_SUPPORT_SUPERG + /* Always do ff node cleanup; for A-MSDU */ + ieee80211_ff_node_cleanup(ni); +#endif vap->iv_stats.is_ht_assoc_downgrade++; } /* |
