From: Rajkumar Manoharan Date: Fri, 14 Jan 2011 19:31:22 +0000 (+0530) Subject: ath9k: preserve caldata history buffer across scanning X-Git-Tag: MMI-PSA29.97-13-9~20520^2~448^2~46 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bdd196a3e00d2be8b50d8af0d8cf845884f4d59b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ath9k: preserve caldata history buffer across scanning caldata's channel info is never filled with operating channel info which is causing the operating channel's noise floor history buffer is reset to default nf during channel change. Signed-off-by: Rajkumar Manoharan Acked-by: Felix Fietkau Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index b68a1acbddd0..b4a92a4313f6 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c @@ -382,9 +382,8 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, s16 default_nf; int i, j; - if (!ah->caldata) - return; - + ah->caldata->channel = chan->channel; + ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT; h = ah->caldata->nfCalHist; default_nf = ath9k_hw_get_default_nf(ah, chan); for (i = 0; i < NUM_NF_READINGS; i++) {