From patchwork Wed Sep 12 13:29:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manoharan, Rajkumar" X-Patchwork-Id: 1443961 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0D41CDF28C for ; Wed, 12 Sep 2012 13:29:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752897Ab2ILN3b (ORCPT ); Wed, 12 Sep 2012 09:29:31 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:10818 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393Ab2ILN3a (ORCPT ); Wed, 12 Sep 2012 09:29:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1347456570; x=1378992570; h=from:to:cc:subject:date:message-id:mime-version; bh=7TGifcZ03EFFcnIiZdAuCOZSJxWomX9zL0PgC4Ftqco=; b=rSe4O815opCHLA5hUR2LEDkkG+jnZJEyejC3tD52ywcfXOKxxE1Zb3ZP 93D9DvtsLCq9etgZ8uwConGetdgBYueNB61Iwyo3e6xmYxVJVCrqbn7Vr aUf2m3qzcaCnxW/otRN/mP55/VdbdYMp4SH0Gag7oaqxXW2cQ1GusVWRz 8=; X-IronPort-AV: E=McAfee;i="5400,1158,6832"; a="235712151" Received: from ironmsg02-l.qualcomm.com ([172.30.48.16]) by wolverine01.qualcomm.com with ESMTP; 12 Sep 2012 06:29:30 -0700 X-IronPort-AV: E=Sophos;i="4.80,408,1344236400"; d="scan'208";a="123219154" Received: from nasanexhc07.na.qualcomm.com ([172.30.39.190]) by ironmsg02-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 12 Sep 2012 06:29:29 -0700 Received: from qcmail1.qualcomm.com (172.30.39.5) by qcmail1.qualcomm.com (172.30.39.190) with Microsoft SMTP Server (TLS) id 14.2.318.1; Wed, 12 Sep 2012 06:29:28 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Wed, 12 Sep 2012 18:59:24 +0530 From: Rajkumar Manoharan To: CC: , Rajkumar Manoharan Subject: [PATCH v2 1/6] ath9k_hw: move 2g5g switch before nfcal start Date: Wed, 12 Sep 2012 18:59:19 +0530 Message-ID: <1347456564-8222-1-git-send-email-rmanohar@qca.qualcomm.com> X-Mailer: git-send-email 1.7.12 MIME-Version: 1.0 X-Originating-IP: [172.30.39.5] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org During fast channel change, perform 2g5g_switch before starting noisefloor calibration to avoid nfload timeout. Signed-off-by: Rajkumar Manoharan --- drivers/net/wireless/ath/ath9k/hw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 40f57aa..e58e79d 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1733,12 +1733,12 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan) if (!ret) goto fail; - ath9k_hw_loadnf(ah, ah->curchan); - ath9k_hw_start_nfcal(ah, true); - if (ath9k_hw_mci_is_enabled(ah)) ar9003_mci_2g5g_switch(ah, false); + ath9k_hw_loadnf(ah, ah->curchan); + ath9k_hw_start_nfcal(ah, true); + if (AR_SREV_9271(ah)) ar9002_hw_load_ani_reg(ah, chan);