diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-11-04 10:27:52 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-11-15 14:37:12 +0100 |
| commit | c1f4c9ede3c799da9f920c1df9ce524145781637 (patch) | |
| tree | b1a5c03f83db67dfcb6839ab1dae489da0556469 | |
| parent | 8fdd136f2200e6b7237e7e48453f4a591d768e3e (diff) | |
| download | linux-c1f4c9ede3c799da9f920c1df9ce524145781637.tar.bz2 | |
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>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1c56abc49627..d08a8492a846 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3426,6 +3426,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); |