KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ath9k: add a patch that prevents excessive retry of single frames during an aggregation session

Browse source 
SVN-Revision: 33989
This commit is contained in:
Felix Fietkau 2012-10-29 12:44:37 +00:00
parent 47f3be57d0
commit c63de0e888
5 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/mac80211/patches/130-mesh_pathtbl_backport.patch
View 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;

30
package/mac80211/patches/300-pending_work.patch
View file

@ -649,3 +649,33 @@
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);

14
package/mac80211/patches/566-ath9k_use_ieee80211_free_txskb.patch
View 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);
@ -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 {

2
package/mac80211/patches/568-ath9k_fix_stale_pointer.patch
View 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;

4
package/mac80211/patches/b01-ath9k-allow-to-disable-bands-via-platform-data.patch
View file

@ -12,7 +12,7 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2395,17 +2395,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
@@ -2413,17 +2413,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
}
eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE);
@ -48,7 +48,7 @@
chip_chainmask = 1;
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -918,6 +918,8 @@ struct ath_hw {
@@ -927,6 +927,8 @@ struct ath_hw {
bool is_clk_25mhz;
int (*get_mac_revision)(void);
int (*external_reset)(void);