aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/broadcom/b43/tables_nphy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/broadcom/b43/tables_nphy.c')
-rw-r--r--drivers/net/wireless/broadcom/b43/tables_nphy.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/broadcom/b43/tables_nphy.c b/drivers/net/wireless/broadcom/b43/tables_nphy.c
index b2f0d245bcf3..44e0957a70cc 100644
--- a/drivers/net/wireless/broadcom/b43/tables_nphy.c
+++ b/drivers/net/wireless/broadcom/b43/tables_nphy.c
@@ -3502,7 +3502,7 @@ static void b43_nphy_tables_init_rev7_volatile(struct b43_wldev *dev)
3502 { 0x2, 0x18, 0x2 }, /* Core 1 */ 3502 { 0x2, 0x18, 0x2 }, /* Core 1 */
3503 }; 3503 };
3504 3504
3505 if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) 3505 if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ)
3506 antswlut = sprom->fem.ghz5.antswlut; 3506 antswlut = sprom->fem.ghz5.antswlut;
3507 else 3507 else
3508 antswlut = sprom->fem.ghz2.antswlut; 3508 antswlut = sprom->fem.ghz2.antswlut;
@@ -3566,7 +3566,7 @@ static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)
3566 struct ssb_sprom *sprom = dev->dev->bus_sprom; 3566 struct ssb_sprom *sprom = dev->dev->bus_sprom;
3567 u8 antswlut; 3567 u8 antswlut;
3568 3568
3569 if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) 3569 if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ)
3570 antswlut = sprom->fem.ghz5.antswlut; 3570 antswlut = sprom->fem.ghz5.antswlut;
3571 else 3571 else
3572 antswlut = sprom->fem.ghz2.antswlut; 3572 antswlut = sprom->fem.ghz2.antswlut;
@@ -3651,7 +3651,7 @@ static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
3651{ 3651{
3652 struct b43_phy *phy = &dev->phy; 3652 struct b43_phy *phy = &dev->phy;
3653 3653
3654 if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { 3654 if (b43_current_band(dev->wl) == NL80211_BAND_2GHZ) {
3655 switch (phy->rev) { 3655 switch (phy->rev) {
3656 case 17: 3656 case 17:
3657 if (phy->radio_rev == 14) 3657 if (phy->radio_rev == 14)
@@ -3698,17 +3698,17 @@ static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
3698const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev) 3698const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev)
3699{ 3699{
3700 struct b43_phy *phy = &dev->phy; 3700 struct b43_phy *phy = &dev->phy;
3701 enum ieee80211_band band = b43_current_band(dev->wl); 3701 enum nl80211_band band = b43_current_band(dev->wl);
3702 struct ssb_sprom *sprom = dev->dev->bus_sprom; 3702 struct ssb_sprom *sprom = dev->dev->bus_sprom;
3703 3703
3704 if (dev->phy.rev < 3) 3704 if (dev->phy.rev < 3)
3705 return b43_ntab_tx_gain_rev0_1_2; 3705 return b43_ntab_tx_gain_rev0_1_2;
3706 3706
3707 /* rev 3+ */ 3707 /* rev 3+ */
3708 if ((dev->phy.n->ipa2g_on && band == IEEE80211_BAND_2GHZ) || 3708 if ((dev->phy.n->ipa2g_on && band == NL80211_BAND_2GHZ) ||
3709 (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ)) { 3709 (dev->phy.n->ipa5g_on && band == NL80211_BAND_5GHZ)) {
3710 return b43_nphy_get_ipa_gain_table(dev); 3710 return b43_nphy_get_ipa_gain_table(dev);
3711 } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) { 3711 } else if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ) {
3712 switch (phy->rev) { 3712 switch (phy->rev) {
3713 case 6: 3713 case 6:
3714 case 5: 3714 case 5:
@@ -3746,7 +3746,7 @@ const s16 *b43_ntab_get_rf_pwr_offset_table(struct b43_wldev *dev)
3746{ 3746{
3747 struct b43_phy *phy = &dev->phy; 3747 struct b43_phy *phy = &dev->phy;
3748 3748
3749 if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { 3749 if (b43_current_band(dev->wl) == NL80211_BAND_2GHZ) {
3750 switch (phy->rev) { 3750 switch (phy->rev) {
3751 case 17: 3751 case 17:
3752 if (phy->radio_rev == 14) 3752 if (phy->radio_rev == 14)