From 868be35105a6cee47ade2d644241778e01836ea5 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 10 Mar 2012 12:59:36 +0000 Subject: mac80211: more patch reorganization, merge an upstream performance optimization patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30865 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/543-ath9k_fix_half_quarter_sifs.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 package/mac80211/patches/543-ath9k_fix_half_quarter_sifs.patch (limited to 'package/mac80211/patches/543-ath9k_fix_half_quarter_sifs.patch') diff --git a/package/mac80211/patches/543-ath9k_fix_half_quarter_sifs.patch b/package/mac80211/patches/543-ath9k_fix_half_quarter_sifs.patch deleted file mode 100644 index 6bde7659f..000000000 --- a/package/mac80211/patches/543-ath9k_fix_half_quarter_sifs.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1007,31 +1007,35 @@ void ath9k_hw_init_global_settings(struc - if (IS_CHAN_HALF_RATE(chan)) { - eifs = 175; - -- if (!AR_SREV_9300_20_OR_LATER(ah)) -+ if (!AR_SREV_9300_20_OR_LATER(ah)) { - rx_lat = 10; -- else -+ sifstime = 8; -+ } else { - rx_lat *= 2; -+ sifstime = 32; -+ } - - tx_lat *= 2; - if (IS_CHAN_A_FAST_CLOCK(ah, chan)) - tx_lat += 11; - - slottime = 13; -- sifstime = 32; - } else if (IS_CHAN_QUARTER_RATE(chan)) { - eifs = 340; - -- if (!AR_SREV_9300_20_OR_LATER(ah)) -+ if (!AR_SREV_9300_20_OR_LATER(ah)) { - rx_lat = 20; -- else -+ sifstime = 8; -+ } else { - rx_lat = (rx_lat * 4) - 1; -+ sifstime = 64; -+ } - - tx_lat *= 4; - if (IS_CHAN_A_FAST_CLOCK(ah, chan)) - tx_lat += 22; - - slottime = 21; -- sifstime = 64; - } else { - if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) { - eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO; -- cgit v1.2.3