From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 22 Feb 2017 15:16:07 +0000 (+0100)
Subject: mac80211: don't handle filtered frames within a BA session
X-Git-Tag: v4.11-rc1~1^2~30^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=890030d3c425f49abaa4acf60e20f288b599f980;p=karo-tx-linux.git

mac80211: don't handle filtered frames within a BA session

When running a BA session, the driver (or the hardware) already takes
care of retransmitting failed frames, since it has to keep the receiver
reorder window in sync.

Adding another layer of retransmit around that does not improve
anything. In fact, it can only lead to some strong reordering with huge
latency.

Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index a3af6e1bfd98..05ccd55b5d83 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -51,7 +51,8 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
 	struct ieee80211_hdr *hdr = (void *)skb->data;
 	int ac;
 
-	if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER) {
+	if (info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
+			   IEEE80211_TX_CTL_AMPDU)) {
 		ieee80211_free_txskb(&local->hw, skb);
 		return;
 	}