package/kernel/mac80211/patches/313-mac80211-fix-sequence-number-allocation-regression.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Tue, 11 Oct 2016 11:24:07 +0200
   3 Subject: [PATCH] mac80211: fix sequence number allocation regression
   4
   5 The recent commit that moved around TX handlers dropped the sequence
   6 number allocation at the end of ieee80211_tx_dequeue and calls
   7 ieee80211_tx_h_sequence instead (for the non-fast-xmit case).
   8 However, it did not change the fast-xmit sequence allocation condition
   9 in ieee80211_xmit_fast_finish, which skipped seqno alloc if intermediate
  10 tx queues are being used.
  11
  12 Drop the now obsolete condition.
  13
  14 Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")
  15 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  16 ---
  17
  18 --- a/net/mac80211/tx.c
  19 +++ b/net/mac80211/tx.c
  20 @@ -3212,7 +3212,6 @@ static void ieee80211_xmit_fast_finish(s
  21                                        struct sk_buff *skb)
  22  {
  23         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
  24 -       struct ieee80211_local *local = sdata->local;
  25         struct ieee80211_hdr *hdr = (void *)skb->data;
  26         u8 tid = IEEE80211_NUM_TIDS;
  27
  28 @@ -3224,8 +3223,7 @@ static void ieee80211_xmit_fast_finish(s
  29         if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
  30                 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
  31                 *ieee80211_get_qos_ctl(hdr) = tid;
  32 -               if (!ieee80211_get_txq(local, &sdata->vif, &sta->sta, skb))
  33 -                       hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
  34 +               hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
  35         } else {
  36                 info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
  37                 hdr->seq_ctrl = cpu_to_le16(sdata->sequence_number);