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/572-ath9k_fix_tx_retry.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/572-ath9k_fix_tx_retry.patch')
| -rw-r--r-- | package/mac80211/patches/572-ath9k_fix_tx_retry.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/package/mac80211/patches/572-ath9k_fix_tx_retry.patch b/package/mac80211/patches/572-ath9k_fix_tx_retry.patch deleted file mode 100644 index dfb09ba22e..0000000000 --- a/package/mac80211/patches/572-ath9k_fix_tx_retry.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -387,7 +387,6 @@ static void ath_tx_complete_aggr(struct - struct ath_frame_info *fi; - int nframes; - u8 tidno; -- bool clear_filter; - int i, retries; - - skb = bf->bf_mpdu; -@@ -484,12 +483,10 @@ static void ath_tx_complete_aggr(struct - */ - txfail = 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, - retries); - -- clear_filter = true; - txpending = 1; - } else { - txfail = 1; -@@ -568,11 +565,13 @@ static void ath_tx_complete_aggr(struct - ieee80211_sta_set_tim(sta); - - spin_lock_bh(&txq->axq_lock); -- if (clear_filter) -- tid->ac->clear_ps_filter = true; - skb_queue_splice(&bf_pending, &tid->buf_q); -- if (!an->sleeping) -+ if (!an->sleeping) { - ath_tx_queue_tid(txq, tid); -+ -+ if (ts->ts_status & ATH9K_TXERR_FILT) -+ tid->ac->clear_ps_filter = true; -+ } - spin_unlock_bh(&txq->axq_lock); - } - |