cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / broadcom / b43 / tables_nphy.c

diff --git a/drivers/net/wireless/broadcom/b43/tables_nphy.c b/drivers/net/wireless/broadcom/b43/tables_nphy.c
index b2f0d24..44e0957 100644 (file)
--- 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)
                { 0x2, 0x18, 0x2 }, /* Core 1 */
        };
 
-       if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
+       if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ)
                antswlut = sprom->fem.ghz5.antswlut;
        else
                antswlut = sprom->fem.ghz2.antswlut;
@@ -3566,7 +3566,7 @@ static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)
        struct ssb_sprom *sprom = dev->dev->bus_sprom;
        u8 antswlut;
 
-       if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
+       if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ)
                antswlut = sprom->fem.ghz5.antswlut;
        else
                antswlut = sprom->fem.ghz2.antswlut;
@@ -3651,7 +3651,7 @@ static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
 {
        struct b43_phy *phy = &dev->phy;
 
-       if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+       if (b43_current_band(dev->wl) == NL80211_BAND_2GHZ) {
                switch (phy->rev) {
                case 17:
                        if (phy->radio_rev == 14)
@@ -3698,17 +3698,17 @@ static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
 const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev)
 {
        struct b43_phy *phy = &dev->phy;
-       enum ieee80211_band band = b43_current_band(dev->wl);
+       enum nl80211_band band = b43_current_band(dev->wl);
        struct ssb_sprom *sprom = dev->dev->bus_sprom;
 
        if (dev->phy.rev < 3)
                return b43_ntab_tx_gain_rev0_1_2;
 
        /* rev 3+ */
-       if ((dev->phy.n->ipa2g_on && band == IEEE80211_BAND_2GHZ) ||
-           (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ)) {
+       if ((dev->phy.n->ipa2g_on && band == NL80211_BAND_2GHZ) ||
+           (dev->phy.n->ipa5g_on && band == NL80211_BAND_5GHZ)) {
                return b43_nphy_get_ipa_gain_table(dev);
-       } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+       } else if (b43_current_band(dev->wl) == NL80211_BAND_5GHZ) {
                switch (phy->rev) {
                case 6:
                case 5:
@@ -3746,7 +3746,7 @@ const s16 *b43_ntab_get_rf_pwr_offset_table(struct b43_wldev *dev)
 {
        struct b43_phy *phy = &dev->phy;
 
-       if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+       if (b43_current_band(dev->wl) == NL80211_BAND_2GHZ) {
                switch (phy->rev) {
                case 17:
                        if (phy->radio_rev == 14)