diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-08-27 21:57:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-27 21:57:07 +0000 |
commit | 6c57c577116b3c885b07f797e701b3b13fbf4895 (patch) | |
tree | 70bd2f03299b8f69cb29e516571519587d7113af /package/mac80211/patches/540-ath9k_sw_retry_reduce.patch | |
parent | 6c219a036ae4abee2e072fe67275e97fd753d52f (diff) | |
download | master-187ad058-6c57c577116b3c885b07f797e701b3b13fbf4895.tar.gz master-187ad058-6c57c577116b3c885b07f797e701b3b13fbf4895.tar.bz2 master-187ad058-6c57c577116b3c885b07f797e701b3b13fbf4895.zip |
mac80211: update to wireless-testing 2011-08-26
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/540-ath9k_sw_retry_reduce.patch')
-rw-r--r-- | package/mac80211/patches/540-ath9k_sw_retry_reduce.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/package/mac80211/patches/540-ath9k_sw_retry_reduce.patch b/package/mac80211/patches/540-ath9k_sw_retry_reduce.patch deleted file mode 100644 index d34b85140a..0000000000 --- a/package/mac80211/patches/540-ath9k_sw_retry_reduce.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -248,13 +248,16 @@ static void ath_tid_drain(struct ath_sof - } - - static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq, -- struct sk_buff *skb) -+ struct sk_buff *skb, int count) - { - struct ath_frame_info *fi = get_frame_info(skb); - struct ieee80211_hdr *hdr; -+ int prev = fi->retries; - - TX_STAT_INC(txq->axq_qnum, a_retries); -- if (fi->retries++ > 0) -+ fi->retries += count; -+ -+ if (prev > 0) - return; - - hdr = (struct ieee80211_hdr *)skb->data; -@@ -359,6 +362,7 @@ static void ath_tx_complete_aggr(struct - int nframes; - u8 tidno; - bool clear_filter; -+ int i, retries; - - skb = bf->bf_mpdu; - hdr = (struct ieee80211_hdr *)skb->data; -@@ -367,6 +371,10 @@ static void ath_tx_complete_aggr(struct - - memcpy(rates, tx_info->control.rates, sizeof(rates)); - -+ retries = ts->ts_longretry + 1; -+ for (i = 0; i < ts->ts_rateindex; i++) -+ retries += rates[i].count; -+ - rcu_read_lock(); - - sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2); -@@ -451,7 +459,8 @@ static void ath_tx_complete_aggr(struct - } else if (fi->retries < ATH_MAX_SW_RETRIES) { - if (!(ts->ts_status & ATH9K_TXERR_FILT) || - !an->sleeping) -- ath_tx_set_retry(sc, txq, bf->bf_mpdu); -+ ath_tx_set_retry(sc, txq, bf->bf_mpdu, -+ retries); - - clear_filter = true; - txpending = 1; ---- a/drivers/net/wireless/ath/ath9k/ath9k.h -+++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -538,7 +538,7 @@ struct ath_ant_comb { - #define DEFAULT_CACHELINE 32 - #define ATH_REGCLASSIDS_MAX 10 - #define ATH_CABQ_READY_TIME 80 /* % of beacon interval */ --#define ATH_MAX_SW_RETRIES 10 -+#define ATH_MAX_SW_RETRIES 20 - #define ATH_CHAN_MAX 255 - - #define ATH_TXPOWER_MAX 100 /* .5 dBm units */ |