svn commit: r297604 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Wed Apr  6 01:22:20 2016
New Revision: 297604
URL: https://svnweb.freebsd.org/changeset/base/297604

Log:
  [net80211] missed commit from last one - always cleanup superg state.

Modified:
  head/sys/net80211/ieee80211_hostap.c

Modified: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c	Wed Apr  6 01:21:51 2016	(r297603)
+++ head/sys/net80211/ieee80211_hostap.c	Wed Apr  6 01:22:20 2016	(r297604)
@@ -2078,8 +2078,8 @@ hostap_recv_mgmt(struct ieee80211_node *
 		} 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 *
 			    "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++;
 		}
 		/*