diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-05-03 21:14:52 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-05-03 21:14:52 +0000 |
| commit | 82b7058bc142872ccac395be779f8123b2842f97 (patch) | |
| tree | 4c24408631d5927236e35977033801e7f8f28936 | |
| parent | 0216e64b929da8bea9d5d152e464cab7e3b848b6 (diff) | |
| download | master-187ad058-82b7058bc142872ccac395be779f8123b2842f97.tar.gz master-187ad058-82b7058bc142872ccac395be779f8123b2842f97.tar.bz2 master-187ad058-82b7058bc142872ccac395be779f8123b2842f97.zip | |
ath5k: merge a tx power handling fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40691 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 1389b801d0..892f51e8a6 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -1,3 +1,18 @@ +commit 4c8a3486cb577d40c1ef75f0a8dc9a04773eef83 +Author: Nickolay Ledovskikh <nledovskikh@gmail.com> +Date: Fri Apr 25 22:53:34 2014 +0400 + + ath5k: Fix AR5K_PHY_TXPOWER_RATE_MAX register value setting. + + I was reading ath5k power setting code and + noticed typing error in ath5k_hw_txpower function. + Invalid value was written to AR5K_PHY_TXPOWER_RATE_MAX + register. + + Signed-off-by: Nikolay Ledovskikh <nledovskikh@gmail.com> + Acked-by: Nick Kossifidis <mickflemm@gmail.com> + Signed-off-by: John W. Linville <linville@tuxdriver.com> + commit 4d76248013dbb1948429555208900a585b0f351d Author: Janusz Dziedzic <janusz.dziedzic@tieto.com> Date: Tue Apr 8 13:38:43 2014 +0200 @@ -513,3 +528,16 @@ Date: Sun Apr 6 23:35:28 2014 +0200 {0x0000a3a4, 0x000000ff}, {0x0000a3a8, 0x6a6a6a6a}, {0x0000a3ac, 0x6a6a6a6a}, +--- a/drivers/net/wireless/ath/ath5k/phy.c ++++ b/drivers/net/wireless/ath/ath5k/phy.c +@@ -3709,8 +3709,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, st + AR5K_REG_MS(AR5K_TUNE_MAX_TXPOWER, AR5K_TPC_CHIRP), + AR5K_TPC); + } else { +- ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX | +- AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX); ++ ath5k_hw_reg_write(ah, AR5K_TUNE_MAX_TXPOWER, ++ AR5K_PHY_TXPOWER_RATE_MAX); + } + + return 0; |