ath9k: preserve caldata history buffer across scanning
authorRajkumar Manoharan <rmanoharan@atheros.com>
Fri, 14 Jan 2011 19:31:22 +0000 (01:01 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Jan 2011 16:36:10 +0000 (11:36 -0500)
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 <rmanoharan@atheros.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/calib.c

index b68a1acbddd0164c707f8f0daf57dda34e702efe..b4a92a4313f6f8fdda2a6afc91057c0201a2909d 100644 (file)
@@ -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++) {