diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-10-09 15:48:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-10-09 15:48:03 +0000 |
commit | a14321df29a785ccfc836d94b0a7111cb1fbe70b (patch) | |
tree | c6db5ac8890ff67cb9546cae8dc635cf263707ec /package/mac80211/patches/541-ath9k_sw_retry_reduce.patch | |
parent | fcdec14820f8729b5ab1263e3b05a893b099a5c8 (diff) | |
download | master-187ad058-a14321df29a785ccfc836d94b0a7111cb1fbe70b.tar.gz master-187ad058-a14321df29a785ccfc836d94b0a7111cb1fbe70b.tar.bz2 master-187ad058-a14321df29a785ccfc836d94b0a7111cb1fbe70b.zip |
mac80211: update to wireless-testing 2011-10-05 + pending patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/541-ath9k_sw_retry_reduce.patch')
-rw-r--r-- | package/mac80211/patches/541-ath9k_sw_retry_reduce.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch b/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch index 1685aabfaa..06a17a2fb4 100644 --- a/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch +++ b/package/mac80211/patches/541-ath9k_sw_retry_reduce.patch @@ -23,7 +23,7 @@ @@ -382,6 +385,7 @@ static void ath_tx_complete_aggr(struct int nframes; u8 tidno; - bool clear_filter; + bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH); + int i, retries; skb = bf->bf_mpdu; @@ -39,19 +39,19 @@ rcu_read_lock(); sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2); -@@ -475,7 +483,8 @@ static void ath_tx_complete_aggr(struct +@@ -476,7 +484,8 @@ static void ath_tx_complete_aggr(struct + txpending = 1; } else if (fi->retries < ATH_MAX_SW_RETRIES) { - if (!(ts->ts_status & ATH9K_TXERR_FILT) || - !an->sleeping) + if (txok || !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; + } else { --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -540,7 +540,7 @@ struct ath_ant_comb { +@@ -542,7 +542,7 @@ struct ath_ant_comb { #define DEFAULT_CACHELINE 32 #define ATH_REGCLASSIDS_MAX 10 #define ATH_CABQ_READY_TIME 80 /* % of beacon interval */ |