aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Stefanik <netrolller.3d@gmail.com>2009-08-04 18:25:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:12:40 -0400
commit7c81e98a60cc525e21a6d86cb4357a626f530699 (patch)
tree1cd921e68c99cae0f26ed1bb5647559d3ef14280
parentc03e20fc9a6ec5741d9df561130ecba38ef50eb6 (diff)
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>
-rw-r--r--drivers/net/wireless/b43/b43.h2
-rw-r--r--drivers/net/wireless/b43/phy_lp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index b6811cff18ba..d57ee9bd4297 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -639,7 +639,7 @@ struct b43_wl {
639 u8 mac_addr[ETH_ALEN]; 639 u8 mac_addr[ETH_ALEN];
640 /* Current BSSID */ 640 /* Current BSSID */
641 u8 bssid[ETH_ALEN]; 641 u8 bssid[ETH_ALEN];
642 /* Interface type. (IEEE80211_IF_TYPE_XXX) */ 642 /* Interface type. (NL80211_IFTYPE_XXX) */
643 int if_type; 643 int if_type;
644 /* Is the card operating in AP, STA or IBSS mode? */ 644 /* Is the card operating in AP, STA or IBSS mode? */
645 bool operating; 645 bool operating;
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index 184fdaf32210..ed3a52886135 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)
130 b43_phy_set(dev, B43_LPPHY_CRSGAIN_CTL, 0x0006); 130 b43_phy_set(dev, B43_LPPHY_CRSGAIN_CTL, 0x0006);
131 b43_phy_write(dev, B43_LPPHY_GPIO_SELECT, 0x0005); 131 b43_phy_write(dev, B43_LPPHY_GPIO_SELECT, 0x0005);
132 b43_phy_write(dev, B43_LPPHY_GPIO_OUTEN, 0xFFFF); 132 b43_phy_write(dev, B43_LPPHY_GPIO_OUTEN, 0xFFFF);
133 b43_hf_write(dev, b43_hf_read(dev) | 0x0800ULL << 32); 133 b43_hf_write(dev, b43_hf_read(dev) | B43_HF_PR45960W);
134 } 134 }
135 if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { 135 if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
136 b43_phy_set(dev, B43_LPPHY_LP_PHY_CTL, 0x8000); 136 b43_phy_set(dev, B43_LPPHY_LP_PHY_CTL, 0x8000);