mac80211: backport latest version from trunk (as of r28137)

[openwrt-10.03/.git] / package / mac80211 / patches / 554-ath9k_test_txpower.patch

diff --git a/package/mac80211/patches/554-ath9k_test_txpower.patch b/package/mac80211/patches/554-ath9k_test_txpower.patch
deleted file mode 100644 (file)
index 96131dc..0000000
--- a/package/mac80211/patches/554-ath9k_test_txpower.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2442,15 +2442,18 @@ void ath9k_hw_set_txpowerlimit(struct at
-       struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
-       struct ath9k_channel *chan = ah->curchan;
-       struct ieee80211_channel *channel = chan->chan;
-+      int reg_pwr = min_t(int, MAX_RATE_POWER, regulatory->power_limit);
-+      int chan_pwr = channel->max_power * 2;
-+
-+      if (test)
-+              reg_pwr = chan_pwr = MAX_RATE_POWER;
- 
-       regulatory->power_limit = min(limit, (u32) MAX_RATE_POWER);
- 
-       ah->eep_ops->set_txpower(ah, chan,
-                                ath9k_regd_get_ctl(regulatory, chan),
-                                channel->max_antenna_gain * 2,
--                               channel->max_power * 2,
--                               min((u32) MAX_RATE_POWER,
--                               (u32) regulatory->power_limit), test);
-+                               chan_pwr, reg_pwr, test);
- }
- EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit);
-