Patchwork [73/98] ath9k: Do not assign noise for NULL caldata

mail settings
Submitter Luis Henriques
Date July 11, 2013, 2:24 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/258524/
State New
Headers show


Luis Henriques - July 11, 2013, 2:24 p.m. -stable review patch.  If anyone has any objections, please let me know.


From: Sujith Manoharan <>

commit d3bcb7b24bbf09fde8405770e676fe0c11c79662 upstream.

ah->noise is maintained globally and not per-channel. This
is updated in the reset() routine after the NF history has been
filled for the *current channel*, just before switching to
the new channel. There is no need to do it inside getnf(), since
ah->noise must contain a value for the new channel.

Signed-off-by: Sujith Manoharan <>
Signed-off-by: John W. Linville <>
Signed-off-by: Luis Henriques <>
 drivers/net/wireless/ath/ath9k/calib.c | 1 -
 1 file changed, 1 deletion(-)


diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 7bdd726..c39f47c 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -387,7 +387,6 @@  bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
 	if (!caldata) {
 		chan->noisefloor = nf;
-		ah->noise = ath9k_hw_getchan_noise(ah, chan);
 		return false;