31 lines
1022 B
Diff
31 lines
1022 B
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Fri, 4 Nov 2016 10:13:34 +0100
|
||
|
|
Subject: [PATCH] mac80211: update A-MPDU flag on tx dequeue
|
||
|
|
|
||
|
|
The sequence number counter is used to derive the starting sequence
|
||
|
|
number. Since that counter is updated on tx dequeue, the A-MPDU flag
|
||
|
|
needs to be up to date at the tme of dequeue as well.
|
||
|
|
|
||
|
|
This patch prevents sending more A-MPDU frames after the session has
|
||
|
|
been terminated and also ensures that aggregation starts right after the
|
||
|
|
session has been established
|
||
|
|
|
||
|
|
Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")
|
||
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/net/mac80211/tx.c
|
||
|
|
+++ b/net/mac80211/tx.c
|
||
|
|
@@ -3462,6 +3462,11 @@ begin:
|
||
|
|
goto begin;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (test_bit(IEEE80211_TXQ_AMPDU, &txqi->flags))
|
||
|
|
+ info->flags |= IEEE80211_TX_CTL_AMPDU;
|
||
|
|
+ else
|
||
|
|
+ info->flags &= ~IEEE80211_TX_CTL_AMPDU;
|
||
|
|
+
|
||
|
|
if (info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) {
|
||
|
|
struct sta_info *sta = container_of(txq->sta, struct sta_info,
|
||
|
|
sta);
|