From patchwork Tue Aug 4 22:10:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Stefanik?= X-Patchwork-Id: 39237 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n74MC3Xs001161 for ; Tue, 4 Aug 2009 22:12:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933437AbZHDWLF (ORCPT ); Tue, 4 Aug 2009 18:11:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933436AbZHDWLE (ORCPT ); Tue, 4 Aug 2009 18:11:04 -0400 Received: from mail-fx0-f217.google.com ([209.85.220.217]:43010 "EHLO mail-fx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933427AbZHDWLA (ORCPT ); Tue, 4 Aug 2009 18:11:00 -0400 Received: by fxm17 with SMTP id 17so3558639fxm.37 for ; Tue, 04 Aug 2009 15:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=O5lUo2OWWTdLTilRvA5kPxu9UsePT+L7no7cO7tq3m8=; b=OBHCJOlaq3yM5BwfF2rQ4fUDd2Hp4CB3q1CpyWLnSNWU9DwCzOO4RZJfwkTerJ8pan Ts5WUNCL1YfTx4y6UHbLtWSxWw6F/vYmyTnQaOT0mQhhb5oQxSwaT4d6c1GxGy5l7ysu jFgalSXE9ykkORnsWePy1a1ttXDKHBRNGCPGI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=Fw+/OtCXhDPw1g+mA0HUNbczolTm4kgzVlxTO/7DuruH7Qlkyi1etp/5h40k/GiiLB Do+eRF7uLBUU0JsFkVZRm9gfCsDwANgLNapbq2dZDuDUoss0PrP6M4qF11Bvnp81a/kB SBC8oc5BYfK9gNyD6VCdzEl/b+U6k5aGjyq88= Received: by 10.103.221.14 with SMTP id y14mr3398874muq.57.1249423859504; Tue, 04 Aug 2009 15:10:59 -0700 (PDT) Received: from ?192.168.1.3? (pool-01fd9.externet.hu [88.209.201.216]) by mx.google.com with ESMTPS id j9sm49489624mue.26.2009.08.04.15.10.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 Aug 2009 15:10:59 -0700 (PDT) Message-ID: <4A78B1F2.8050803@gmail.com> Date: Wed, 05 Aug 2009 00:10:58 +0200 From: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Linville , Michael Buesch CC: Larry Finger , Broadcom Wireless , linux-wireless Subject: [PATCH] b43: Typo fixes & minor cleanup Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Fix a typo in the HostFlags #defines. Make use of HostFlags defines in the LP-PHY code. Fix fallout from the IEEE80211_IF_TYPE to NL80211_IFTYPE change. Signed-off-by: Gábor Stefanik --- drivers/net/wireless/b43/b43.h | 4 ++-- drivers/net/wireless/b43/phy_lp.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 41ca727..5d79d10 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -300,7 +300,7 @@ enum { #define B43_HF_TXBTCHECK 0x000002000000ULL /* Bluetooth check during transmission */ #define B43_HF_SKCFPUP 0x000004000000ULL /* Skip CFP update */ #define B43_HF_N40W 0x000008000000ULL /* N PHY 40 MHz workaround (rev >= 13 only) */ -#define B43_HF_ANTSEL 0x000020000000ULL /* Antenna selection (for testing antenna div.) */ +#define B43_HF_ANTSEL 0x000010000000ULL /* Antenna selection (for testing antenna div.) */ #define B43_HF_BT3COEXT 0x000020000000ULL /* Bluetooth 3-wire coexistence (rev >= 13 only) */ #define B43_HF_BTCANT 0x000040000000ULL /* Bluetooth coexistence (antenna mode) (rev >= 13 only) */ #define B43_HF_ANTSELEN 0x000100000000ULL /* Antenna selection enabled (rev >= 13 only) */ @@ -627,7 +627,7 @@ struct b43_wl { u8 mac_addr[ETH_ALEN]; /* Current BSSID */ u8 bssid[ETH_ALEN]; - /* Interface type. (IEEE80211_IF_TYPE_XXX) */ + /* Interface type. (NL80211_IFTYPE_XXX) */ int if_type; /* Is the card operating in AP, STA or IBSS mode? */ bool operating; diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index 5d50943..03a9b50 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c @@ -130,7 +130,7 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev) b43_phy_set(dev, B43_LPPHY_CRSGAIN_CTL, 0x0006); b43_phy_write(dev, B43_LPPHY_GPIO_SELECT, 0x0005); b43_phy_write(dev, B43_LPPHY_GPIO_OUTEN, 0xFFFF); - b43_hf_write(dev, b43_hf_read(dev) | 0x0800ULL << 32); + b43_hf_write(dev, b43_hf_read(dev) | B43_HF_PR45960W); } if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { b43_phy_set(dev, B43_LPPHY_LP_PHY_CTL, 0x8000);