b43: Typo fixes & minor cleanup

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 <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index b6811cff18ba20b06969d14ab5ee3a3bf19a4aee..d57ee9bd42975d0148d608ce8c959234782d8654 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -639,7 +639,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 184fdaf32210234f40de83fb23f86e3b47b43447..ed3a52886135bef9cf50866f4dd360fd58f47e67 100644 (file)
--- 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);