From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042855.610309685@goodmis.org> Date: Wed, 11 Sep 2013 00:27:28 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sujith Manoharan , "John W. Linville" Subject: [021/251] ath9k: Do not assign noise for NULL caldata References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0021-ath9k-Do-not-assign-noise-for-NULL-caldata.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Sujith Manoharan [ 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: stable@vger.kernel.org Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville Signed-off-by: Steven Rostedt --- 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