From patchwork Tue Nov 30 21:33:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 368741 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 oAULXf6q026704 for ; Tue, 30 Nov 2010 21:33:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751526Ab0K3Vdk (ORCPT ); Tue, 30 Nov 2010 16:33:40 -0500 Received: from mail-ww0-f42.google.com ([74.125.82.42]:62589 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311Ab0K3Vdj (ORCPT ); Tue, 30 Nov 2010 16:33:39 -0500 Received: by wwb28 with SMTP id 28so40675wwb.1 for ; Tue, 30 Nov 2010 13:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=Q5Sy4mET+KNcilJkGEBY9863hpdKqFh2G+NwYG/HEkk=; b=FQO9ulTalyMOY+ykew5s+cb+HkZlavAJc350vvlHCpwu48IQi5Fin71VQA6UWiG8jH Hf0WNZHen/w6lLYShlig0ItzgMkN+QY82ilAHCqwOmC6oTtX0sHiOv6DDGlavAEGK6qk yBvCOcGvB5vhROg+XL/n1zg9q+4CXE8Y083A0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=jjhOmc+dQ4AEpwL4PI0sUjhBm0y+8OcmUyI8ORawn2togC3/R9sn8142hmwPo4Qo3y YV73wx1R94/5xIIwXwUKd8TIJPK/0Nrkmmv6VDvIP4UvSPI9iOVvU3kUYowauyAY/E5l 7B57RMP4xfHiORGrRhkPTyATohb8W2n7B1JIg= Received: by 10.227.129.76 with SMTP id n12mr8349130wbs.100.1291152817962; Tue, 30 Nov 2010 13:33:37 -0800 (PST) Received: from localhost.localdomain ([192.167.23.210]) by mx.google.com with ESMTPS id m10sm1538265wbc.22.2010.11.30.13.33.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 30 Nov 2010 13:33:37 -0800 (PST) From: =?utf-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-wireless@vger.kernel.org, "John W. Linville" Cc: b43-dev@lists.infradead.org, =?utf-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 3/3] b43: N-PHY: fix code path on PHY init Date: Tue, 30 Nov 2010 22:33:16 +0100 Message-Id: <1291152796-18700-3-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1291152796-18700-1-git-send-email-zajec5@gmail.com> References: <1291152796-18700-1-git-send-email-zajec5@gmail.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Nov 2010 21:33:41 +0000 (UTC) diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index f26b60b..905f1d7 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -3498,19 +3498,16 @@ int b43_phy_initn(struct b43_wldev *dev) /* TODO N PHY Pre Calibrate TX Gain */ target = b43_nphy_get_tx_gains(dev); } - } + if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false)) + if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0) + b43_nphy_save_cal(dev); + } else if (nphy->mphase_cal_phase_id == 0) + ;/* N PHY Periodic Calibration with arg 3 */ + } else { + b43_nphy_restore_cal(dev); } } - if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false)) { - if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0) - b43_nphy_save_cal(dev); - else if (nphy->mphase_cal_phase_id == 0) - ;/* N PHY Periodic Calibration with argument 3 */ - } else { - b43_nphy_restore_cal(dev); - } - b43_nphy_tx_pwr_ctrl_coef_setup(dev); b43_nphy_tx_power_ctrl(dev, tx_pwr_state); b43_phy_write(dev, B43_NPHY_TXMACIF_HOLDOFF, 0x0015);