From: Wojciech Dubowik Date: Tue, 30 Jan 2018 12:06:07 +0000 (+0200) Subject: ath9k: Fix get channel default noise floor X-Git-Tag: v5.15~9413^2~11^2^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9607de6cf22a5cd268b9206177a9baafb6e8ac8;p=platform%2Fkernel%2Flinux-starfive.git ath9k: Fix get channel default noise floor Commit 8da58553cc63 ("ath9k: Use calibrated noise floor value when available") introduced regression in ath9k_hw_getchan_noise where per chain nominal noise floor has been taken instead default for channel. Revert to original default channel noise floor. Fixes: 8da58553cc63 ("ath9k: Use calibrated noise floor value when available") Reported-by: Sebastian Gottschall Signed-off-by: Wojciech Dubowik Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index 3d9447e..695c779 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c @@ -72,7 +72,7 @@ static s16 ath9k_hw_get_default_nf(struct ath_hw *ah, s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan, s16 nf) { - s8 noise = ath9k_hw_get_default_nf(ah, chan, 0); + s8 noise = ATH_DEFAULT_NOISE_FLOOR; if (nf) { s8 delta = nf - ATH9K_NF_CAL_NOISE_THRESH -