ath9k: Fix get channel default noise floor

Web:        https://git.kernel.org/torvalds/c/b9607de6cf22a5cd268b9206177a9baafb6e8ac8
Commit:     b9607de6cf22a5cd268b9206177a9baafb6e8ac8
Parent:     34f1cb339cae5c0b6b75094e2d5c79d19be424ed
Refname:    refs/heads/master
Author:     Wojciech Dubowik <[email protected]>
AuthorDate: Tue Jan 30 14:06:07 2018 +0200
Committer:  Kalle Valo <[email protected]>
CommitDate: Wed Feb 7 16:14:08 2018 +0200

    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 <[email protected]>
    Signed-off-by: Wojciech Dubowik <[email protected]>
    Signed-off-by: Kalle Valo <[email protected]>
---
 drivers/net/wireless/ath/ath9k/calib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 3d9447e21025..695c779ae8cf 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 -
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html