Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 486c98541afc..f0ffd62f02d3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -217,14 +217,14 @@ static const u8 fw_rate_idx_to_plcp[IWL_RATE_COUNT] = {
 };
 
 int iwl_mvm_legacy_rate_to_mac80211_idx(u32 rate_n_flags,
-                                        enum ieee80211_band band)
+                                        enum nl80211_band band)
 {
         int rate = rate_n_flags & RATE_LEGACY_RATE_MSK;
         int idx;
         int band_offset = 0;
 
         /* Legacy rate format, search for match in table */
-        if (band == IEEE80211_BAND_5GHZ)
+        if (band == NL80211_BAND_5GHZ)
                 band_offset = IWL_FIRST_OFDM_RATE;
         for (idx = band_offset; idx < IWL_RATE_COUNT_LEGACY; idx++)
                 if (fw_rate_idx_to_plcp[idx] == rate)