From 218b3d3db49ee6096fb557987a2bdfa0d327e0fd Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 29 Oct 2012 12:47:58 +0000 Subject: ath9k: add a patch that prevents excessive retry of single frames during an aggregation session Backport of r33989 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33990 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/566-ath9k_use_ieee80211_free_txskb.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch') diff --git a/package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch b/package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch index dd484662b..820d5c9f4 100644 --- a/package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch +++ b/package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch @@ -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); @@ -108,7 +108,7 @@ } /* 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 { -- cgit v1.2.3