38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Tue, 11 Oct 2016 11:24:07 +0200
|
||
|
|
Subject: [PATCH] mac80211: fix sequence number allocation regression
|
||
|
|
|
||
|
|
The recent commit that moved around TX handlers dropped the sequence
|
||
|
|
number allocation at the end of ieee80211_tx_dequeue and calls
|
||
|
|
ieee80211_tx_h_sequence instead (for the non-fast-xmit case).
|
||
|
|
However, it did not change the fast-xmit sequence allocation condition
|
||
|
|
in ieee80211_xmit_fast_finish, which skipped seqno alloc if intermediate
|
||
|
|
tx queues are being used.
|
||
|
|
|
||
|
|
Drop the now obsolete condition.
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -3212,7 +3212,6 @@ static void ieee80211_xmit_fast_finish(s
|
||
|
|
struct sk_buff *skb)
|
||
|
|
{
|
||
|
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
||
|
|
- struct ieee80211_local *local = sdata->local;
|
||
|
|
struct ieee80211_hdr *hdr = (void *)skb->data;
|
||
|
|
u8 tid = IEEE80211_NUM_TIDS;
|
||
|
|
|
||
|
|
@@ -3224,8 +3223,7 @@ static void ieee80211_xmit_fast_finish(s
|
||
|
|
if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
|
||
|
|
tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
|
||
|
|
*ieee80211_get_qos_ctl(hdr) = tid;
|
||
|
|
- if (!ieee80211_get_txq(local, &sdata->vif, &sta->sta, skb))
|
||
|
|
- hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
|
||
|
|
+ hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
|
||
|
|
} else {
|
||
|
|
info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
|
||
|
|
hdr->seq_ctrl = cpu_to_le16(sdata->sequence_number);
|