From patchwork Thu May 26 05:00:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Chadd X-Patchwork-Id: 819342 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 p4Q50ciS016704 for ; Thu, 26 May 2011 05:00:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751206Ab1EZFAg (ORCPT ); Thu, 26 May 2011 01:00:36 -0400 Received: from mail-yi0-f46.google.com ([209.85.218.46]:43248 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124Ab1EZFAg (ORCPT ); Thu, 26 May 2011 01:00:36 -0400 Received: by yia27 with SMTP id 27so150791yia.19 for ; Wed, 25 May 2011 22:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:date:x-google-sender-auth :message-id:subject:from:to:cc:content-type; bh=ba3GWNc3oXpWzww5LpsjbKE29BLY8A9SD1GMyjXHxVY=; b=H4CC+3XiS1TRBpZ6xEAGOcfVqkVLCYVca58JONfJ5yTkDOh8J+nz2VRbfRLq9fEZp0 PIW0F2IvD4GOUc9S0FE05sl6IcdT2HAZvZGhWk3uyh2BQFWBoELqf2j0OuwKondIWgIw 9zVZYyOjtxOKDDEH6XoYetkc3CifJJAe1UsWw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; b=Jz6fcFaDKgCvh1Sen6kM5pNaGjioNahLehUnL+RfIRYzDzN3E+nbc4D7sGqBqYi/Uc 2Bld77UJExo0E9uI9PYRUf284BHpYGgoZnuQVZv5mHFQ/cNOVwxa8cd+PMMEtfFCx8a3 GGOvXVfacOneDe50woIurEImwt2+Kd6qBSDTQ= MIME-Version: 1.0 Received: by 10.150.182.1 with SMTP id e1mr465196ybf.299.1306386035701; Wed, 25 May 2011 22:00:35 -0700 (PDT) Received: by 10.151.107.15 with HTTP; Wed, 25 May 2011 22:00:35 -0700 (PDT) Date: Thu, 26 May 2011 13:00:35 +0800 X-Google-Sender-Auth: moa7KHWmPdB_F9fQKUuefRdrfEM Message-ID: Subject: [PATCH] ath9k: Fix Kiwi (AR9287) initial calibration From: Adrian Chadd To: linux-wireless@vger.kernel.org Cc: ath9k-devel 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]); Thu, 26 May 2011 05:00:40 +0000 (UTC) Hi, The AR9287 initial calibration in ar9002_hw_init_cal() isn't ever called because the Kite check (AR_SREV_9285_12_OR_LATER()) matches on MACs versioned Kite and later. The Atheros newma code checks it is Kite as well as being Kite >= 1.2. I don't currently have Linux ath9k on something with an AR9287 so I'd appreciate it if this were verified by someone who has. The patch is quite simple: } else { Thanks, Adrian --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c index 015d974..2d4c091 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c @@ -829,7 +829,7 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan) if (AR_SREV_9271(ah)) { if (!ar9285_hw_cl_cal(ah, chan)) return false; - } else if (AR_SREV_9285_12_OR_LATER(ah)) { + } else if (AR_SREV_9285(ah) && AR_SREV_9285_12_OR_LATER(ah)) { if (!ar9285_hw_clc(ah, chan)) return false;