From patchwork Thu May 26 17:08:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Chadd X-Patchwork-Id: 821382 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 p4QH8QWx025482 for ; Thu, 26 May 2011 17:08:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757976Ab1EZRIJ (ORCPT ); Thu, 26 May 2011 13:08:09 -0400 Received: from mail-yi0-f46.google.com ([209.85.218.46]:36795 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757965Ab1EZRIF (ORCPT ); Thu, 26 May 2011 13:08:05 -0400 Received: by yia27 with SMTP id 27so367045yia.19 for ; Thu, 26 May 2011 10:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=CGH/+8vTton03EkfHoqfFPi3t6KcEZyDYvyFceDZoyw=; b=jHwPoIKJIOeegSxkxsW4iCHpZBpMV5KKtm5ftyxmP4ot8RxrxdrGQFRLgNZMqLDlV5 uALCyZ597oYZeqx3rrOR6p3SvuwvX0iuiSkwf8/mU3JrfLJtqR1mMM59RSxGAKP1qVId ANE0j2ZpDYQwAzUunWFhe4eRmZwzELHYQRldM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=bZHseEuO2HBuR180JXtRuX/bMh7mWqkgTXgyiEe7a3aW/9nqh12eIZK8XsBX0PS6dT hKcrf2SOVk2YKuG3jAYQ5HAtp1auEnT4uGY5XDfvTiRykkHvwZFYK04NAiflxjYm8rqp qBnTCxrupkoTGkrBH1wz9js5MN5bIhsC38+Ew= MIME-Version: 1.0 Received: by 10.150.230.4 with SMTP id c4mr1265973ybh.242.1306429684606; Thu, 26 May 2011 10:08:04 -0700 (PDT) Received: by 10.151.107.15 with HTTP; Thu, 26 May 2011 10:08:04 -0700 (PDT) Date: Fri, 27 May 2011 01:08:04 +0800 Message-ID: Subject: [PATCH] ath9k: Fix AR9287 calibration From: Adrian Chadd To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org 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 17:08:29 +0000 (UTC) The AR9287 calibration code was not being called because of an incorrect MAC revision check. This forced the AR9287 to use the AR9285 initial calibration code and bypass the AR9287 code entirely. Signed-off-by: Adrian Chadd } else { --- 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;