ath9k: merge a pending aggregation fix

SVN-Revision: 29273

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 3a4a059b45c03c6027f805506b793d29bddc0ea2..e86505368d67357c7a23eba7012fb867b7469ae1 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -346,7 +346,36 @@
  
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -1955,7 +1955,7 @@ static void ath_tx_complete(struct ath_s
+@@ -179,6 +179,11 @@ static void ath_tx_flush_tid(struct ath_
+               spin_lock_bh(&txq->axq_lock);
+       }
+ 
++      if (tid->baw_head == tid->baw_tail) {
++              tid->state &= ~AGGR_ADDBA_COMPLETE;
++              tid->state &= ~AGGR_CLEANUP;
++      }
++
+       spin_unlock_bh(&txq->axq_lock);
+ }
+ 
+@@ -556,15 +561,9 @@ static void ath_tx_complete_aggr(struct 
+               spin_unlock_bh(&txq->axq_lock);
+       }
+ 
+-      if (tid->state & AGGR_CLEANUP) {
++      if (tid->state & AGGR_CLEANUP)
+               ath_tx_flush_tid(sc, tid);
+ 
+-              if (tid->baw_head == tid->baw_tail) {
+-                      tid->state &= ~AGGR_ADDBA_COMPLETE;
+-                      tid->state &= ~AGGR_CLEANUP;
+-              }
+-      }
+-
+       rcu_read_unlock();
+ 
+       if (needreset) {
+@@ -1955,7 +1954,7 @@ static void ath_tx_complete(struct ath_s
                skb_pull(skb, padsize);
        }
  

diff --git a/package/mac80211/patches/540-ath9k_limit_qlen.patch b/package/mac80211/patches/540-ath9k_limit_qlen.patch
index 10dde1bf9c22bc759c4a71c2e7f0825928562dda..237966eb0323f1e33071418bc107ab95f067cbfd 100644 (file)
--- a/package/mac80211/patches/540-ath9k_limit_qlen.patch
+++ b/package/mac80211/patches/540-ath9k_limit_qlen.patch
@@ -33,7 +33,7 @@
        debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -350,6 +350,14 @@ static void ath_tx_count_frames(struct a
+@@ -355,6 +355,14 @@ static void ath_tx_count_frames(struct a
        }
  }
  
@@ -48,7 +48,7 @@
  
  static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                 struct ath_buf *bf, struct list_head *bf_q,
-@@ -438,6 +446,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -443,6 +451,8 @@ static void ath_tx_complete_aggr(struct 
        __skb_queue_head_init(&bf_pending);
  
        ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
@@ -57,7 +57,7 @@
        while (bf) {
                u16 seqno = bf->bf_state.seqno;
  
-@@ -824,6 +834,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -823,6 +833,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
                        ath_tx_addto_baw(sc, tid, seqno);
                bf->bf_state.ndelim = ndelim;
  
@@ -65,7 +65,7 @@
                __skb_unlink(skb, &tid->buf_q);
                list_add_tail(&bf->list, bf_q);
                if (bf_prev)
-@@ -1683,6 +1694,8 @@ static void ath_tx_send_ampdu(struct ath
+@@ -1682,6 +1693,8 @@ static void ath_tx_send_ampdu(struct ath
        /* Add sub-frame to BAW */
        ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
  
@@ -74,7 +74,7 @@
        /* Queue to h/w without aggregation */
        TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw);
        bf->bf_lastbf = bf;
-@@ -1811,23 +1824,13 @@ error:
+@@ -1810,23 +1823,13 @@ error:
  
  /* FIXME: tx power */
  static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
@@ -100,7 +100,7 @@
  
        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
                /*
-@@ -1862,6 +1865,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1861,6 +1864,7 @@ int ath_tx_start(struct ieee80211_hw *hw
        struct ieee80211_vif *vif = info->control.vif;
        struct ath_softc *sc = hw->priv;
        struct ath_txq *txq = txctl->txq;
@@ -108,7 +108,7 @@
        int padpos, padsize;
        int frmlen = skb->len + FCS_LEN;
        int q;
-@@ -1904,6 +1908,24 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1903,6 +1907,24 @@ int ath_tx_start(struct ieee80211_hw *hw
  
        setup_frame_info(hw, skb, frmlen);
  
@@ -133,7 +133,7 @@
        /*
         * At this point, the vif, hw_key and sta pointers in the tx control
         * info are no longer valid (overwritten by the ath_frame_info data.
-@@ -1918,7 +1940,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1917,7 +1939,7 @@ int ath_tx_start(struct ieee80211_hw *hw
        }
        spin_unlock_bh(&txq->axq_lock);
  

diff --git a/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch b/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch
index 79f138df67aaea43af54d48e8f168e542824db22..d83b663fbc5a5bb36aa6298a9311d680210fe899 100644 (file)
--- a/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch
+++ b/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -259,14 +259,17 @@ static void ath_tid_drain(struct ath_sof
+@@ -264,14 +264,17 @@ static void ath_tid_drain(struct ath_sof
  }
  
  static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
@@ -20,7 +20,7 @@
                return;
  
        hdr = (struct ieee80211_hdr *)skb->data;
-@@ -382,6 +385,7 @@ static void ath_tx_complete_aggr(struct 
+@@ -387,6 +390,7 @@ static void ath_tx_complete_aggr(struct 
        int nframes;
        u8 tidno;
        bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
@@ -28,7 +28,7 @@
  
        skb = bf->bf_mpdu;
        hdr = (struct ieee80211_hdr *)skb->data;
-@@ -390,6 +394,10 @@ static void ath_tx_complete_aggr(struct 
+@@ -395,6 +399,10 @@ static void ath_tx_complete_aggr(struct 
  
        memcpy(rates, tx_info->control.rates, sizeof(rates));
  
@@ -39,7 +39,7 @@
        rcu_read_lock();
  
        sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
-@@ -476,7 +484,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -481,7 +489,8 @@ static void ath_tx_complete_aggr(struct 
                                txpending = 1;
                        } else if (fi->retries < ATH_MAX_SW_RETRIES) {
                                if (txok || !an->sleeping)