ath9k: add a patch that prevents excessive retry of single frames during an aggregati...
authorFelix Fietkau <nbd@openwrt.org>
Mon, 29 Oct 2012 12:47:58 +0000 (12:47 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 29 Oct 2012 12:47:58 +0000 (12:47 +0000)
Backport of r33989

SVN-Revision: 33990

package/mac80211/patches/130-mesh_pathtbl_backport.patch
package/mac80211/patches/300-pending_work.patch
package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch
package/mac80211/patches/568-ath9k_fix_stale_pointer.patch

index 15ad03c..fbe3e3a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/mac80211/mesh_pathtbl.c
 +++ b/net/mac80211/mesh_pathtbl.c
-@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct
+@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct 
        struct hlist_node *p;
        int i;
  
index 9a4b24e..6f35a07 100644 (file)
  
        return rdev->ops->deauth(&rdev->wiphy, dev, &req);
  }
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -386,7 +386,7 @@ static void ath_tx_complete_aggr(struct 
+       u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
+       u32 ba[WME_BA_BMP_SIZE >> 5];
+       int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
+-      bool rc_update = true;
++      bool rc_update = true, isba;
+       struct ieee80211_tx_rate rates[4];
+       struct ath_frame_info *fi;
+       int nframes;
+@@ -430,13 +430,17 @@ static void ath_tx_complete_aggr(struct 
+       tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
+       tid = ATH_AN_2_TID(an, tidno);
+       seq_first = tid->seq_start;
++      isba = ts->ts_flags & ATH9K_TX_BA;
+       /*
+        * The hardware occasionally sends a tx status for the wrong TID.
+        * In this case, the BA status cannot be considered valid and all
+        * subframes need to be retransmitted
++       *
++       * Only BlockAcks have a TID and therefore normal Acks cannot be
++       * checked
+        */
+-      if (tidno != ts->tid)
++      if (isba && tidno != ts->tid)
+               txok = false;
+       isaggr = bf_isaggr(bf);
index dd48466..820d5c9 100644 (file)
@@ -27,7 +27,7 @@
                        list_add_tail(&bf->list, &bf_head);
                        ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
-@@ -785,10 +792,13 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -789,10 +796,13 @@ static enum ATH_AGGR_STATUS ath_tx_form_
                fi = get_frame_info(skb);
                bf = fi->bf;
                if (!fi->bf)
@@ -43,7 +43,7 @@
  
                bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR;
                seqno = bf->bf_state.seqno;
-@@ -1731,9 +1741,11 @@ static void ath_tx_send_ampdu(struct ath
+@@ -1735,9 +1745,11 @@ static void ath_tx_send_ampdu(struct ath
                return;
        }
  
@@ -57,7 +57,7 @@
  
        bf->bf_state.bf_type = BUF_AMPDU;
        INIT_LIST_HEAD(&bf_head);
-@@ -1757,11 +1769,6 @@ static void ath_tx_send_normal(struct at
+@@ -1761,11 +1773,6 @@ static void ath_tx_send_normal(struct at
        struct ath_buf *bf;
  
        bf = fi->bf;
@@ -69,7 +69,7 @@
  
        INIT_LIST_HEAD(&bf_head);
        list_add_tail(&bf->list, &bf_head);
-@@ -1835,8 +1842,7 @@ u8 ath_txchainmask_reduction(struct ath_
+@@ -1839,8 +1846,7 @@ u8 ath_txchainmask_reduction(struct ath_
  static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                           struct ath_txq *txq,
                                           struct ath_atx_tid *tid,
@@ -79,7 +79,7 @@
  {
        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
        struct ath_frame_info *fi = get_frame_info(skb);
-@@ -1848,7 +1854,7 @@ static struct ath_buf *ath_tx_setup_buff
+@@ -1852,7 +1858,7 @@ static struct ath_buf *ath_tx_setup_buff
        bf = ath_tx_get_buffer(sc);
        if (!bf) {
                ath_dbg(common, XMIT, "TX buffers are full\n");
@@ -88,7 +88,7 @@
        }
  
        ATH_TXBUF_RESET(bf);
-@@ -1877,18 +1883,12 @@ static struct ath_buf *ath_tx_setup_buff
+@@ -1881,18 +1887,12 @@ static struct ath_buf *ath_tx_setup_buff
                ath_err(ath9k_hw_common(sc->sc_ah),
                        "dma_mapping_error() on TX\n");
                ath_tx_return_buffer(sc, bf);
  }
  
  /* FIXME: tx power */
-@@ -1917,9 +1917,14 @@ static void ath_tx_start_dma(struct ath_
+@@ -1921,9 +1921,14 @@ static void ath_tx_start_dma(struct ath_
                 */
                ath_tx_send_ampdu(sc, tid, skb, txctl);
        } else {
index 95ed687..183553d 100644 (file)
@@ -8,7 +8,7 @@
        list_del(&bf->list);
  
        spin_unlock_bh(&sc->tx.txbuflock);
-@@ -1774,6 +1775,7 @@ static void ath_tx_send_normal(struct at
+@@ -1778,6 +1779,7 @@ static void ath_tx_send_normal(struct at
        list_add_tail(&bf->list, &bf_head);
        bf->bf_state.bf_type = 0;