3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sujith Manoharan <c_man...@qca.qualcomm.com>
[ Upstream commit d3bcb7b24bbf09fde8405770e676fe0c11c79662 ]
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.
Cc: sta...@vger.kernel.org
Signed-off-by: Sujith Manoharan <c_man...@qca.qualcomm.com>
Signed-off-by: John W. Linville <linvi...@tuxdriver.com>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
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 e5cceb0..00960b7 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -388,7 +388,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;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
