Author: nbd Date: 2014-10-25 11:30:59 +0200 (Sat, 25 Oct 2014) New Revision: 43053
Modified: branches/barrier_breaker/package/kernel/mac80211/patches/300-pending_work.patch Log: ath9k: backport tx power reporting fix Signed-off-by: Felix Fietkau <[email protected]> Modified: branches/barrier_breaker/package/kernel/mac80211/patches/300-pending_work.patch =================================================================== --- branches/barrier_breaker/package/kernel/mac80211/patches/300-pending_work.patch 2014-10-24 22:00:34 UTC (rev 43052) +++ branches/barrier_breaker/package/kernel/mac80211/patches/300-pending_work.patch 2014-10-25 09:30:59 UTC (rev 43053) @@ -1,3 +1,16 @@ +commit c35074725eb19f353beb5f71266f9e985e46f583 +Author: Felix Fietkau <[email protected]> +Date: Wed Oct 22 18:16:14 2014 +0200 + + ath9k_common: always update value in ath9k_cmn_update_txpow + + In some cases the limit may be the same as reg->power_limit, but the + actual value that the hardware uses is not up to date. In that case, a + wrong value for current tx power is tracked internally. + Fix this by unconditionally updating it. + + Signed-off-by: Felix Fietkau <[email protected]> + commit 11f17631d9bf2a9e910dac7d09ba4581f5693831 Author: Felix Fietkau <[email protected]> Date: Tue Sep 9 09:48:30 2014 +0200 @@ -3291,3 +3304,21 @@ #define AR_RTC_9160_PLL_DIV 0x000003ff #define AR_RTC_9160_PLL_DIV_S 0 +--- a/drivers/net/wireless/ath/ath9k/common.c ++++ b/drivers/net/wireless/ath/ath9k/common.c +@@ -368,11 +368,11 @@ void ath9k_cmn_update_txpow(struct ath_h + { + struct ath_regulatory *reg = ath9k_hw_regulatory(ah); + +- if (reg->power_limit != new_txpow) { ++ if (reg->power_limit != new_txpow) + ath9k_hw_set_txpowerlimit(ah, new_txpow, false); +- /* read back in case value is clamped */ +- *txpower = reg->max_power_level; +- } ++ ++ /* read back in case value is clamped */ ++ *txpower = reg->max_power_level; + } + EXPORT_SYMBOL(ath9k_cmn_update_txpow); + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
