From patchwork Fri Jan 14 19:31:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajkumar Manoharan X-Patchwork-Id: 480321 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0EJWBgw017176 for ; Fri, 14 Jan 2011 19:32:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757309Ab1ANTcK (ORCPT ); Fri, 14 Jan 2011 14:32:10 -0500 Received: from mail.atheros.com ([12.19.149.2]:43264 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754164Ab1ANTcI (ORCPT ); Fri, 14 Jan 2011 14:32:08 -0500 Received: from mail.atheros.com ([10.10.20.108]) by sidewinder.atheros.com for ; Fri, 14 Jan 2011 11:31:50 -0800 Received: from mail.atheros.com (10.12.4.12) by SC1EXHC-02.global.atheros.com (10.10.20.106) with Microsoft SMTP Server (TLS) id 8.2.213.0; Fri, 14 Jan 2011 11:32:07 -0800 Received: by mail.atheros.com (sSMTP sendmail emulation); Sat, 15 Jan 2011 01:01:23 +0530 From: Rajkumar Manoharan To: CC: Rajkumar Manoharan Subject: [PATCH] ath9k: preserve caldata history buffer across scanning Date: Sat, 15 Jan 2011 01:01:22 +0530 Message-ID: <1295033482-12257-1-git-send-email-rmanoharan@atheros.com> X-Mailer: git-send-email 1.7.3.5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 14 Jan 2011 19:32:12 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index b68a1ac..b4a92a4 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++) {