package/mac80211/patches/530-ath9k_tid_seq_fix.patch

   1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
   2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
   3 @@ -1689,17 +1689,20 @@ static void ath_tx_start_dma(struct ath_
   4         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
   5         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
   6         struct list_head bf_head;
   7 -       struct ath_atx_tid *tid;
   8 +       struct ath_atx_tid *tid = NULL;
   9         u8 tidno;
  10
  11         spin_lock_bh(&txctl->txq->axq_lock);
  12
  13 -       if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && txctl->an) {
  14 +       if (ieee80211_is_data_qos(hdr->frame_control) && txctl->an) {
  15                 tidno = ieee80211_get_qos_ctl(hdr)[0] &
  16                         IEEE80211_QOS_CTL_TID_MASK;
  17                 tid = ATH_AN_2_TID(txctl->an, tidno);
  18
  19                 WARN_ON(tid->ac->txq != txctl->txq);
  20 +       }
  21 +
  22 +       if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
  23                 /*
  24                  * Try aggregation if it's a unicast data frame
  25                  * and the destination is HT capable.
  26 @@ -1716,7 +1719,7 @@ static void ath_tx_start_dma(struct ath_
  27                         ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc,
  28                                                    bf->bf_state.bfs_paprd);
  29
  30 -               ath_tx_send_normal(sc, txctl->txq, NULL, &bf_head);
  31 +               ath_tx_send_normal(sc, txctl->txq, tid, &bf_head);
  32         }
  33
  34         spin_unlock_bh(&txctl->txq->axq_lock);