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/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
index 74c51615244e..f6591c83d636 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
@@ -335,7 +335,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
         if (!buf)
                 return -ENOMEM;
 
-        supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ);
+        supp_band = iwl_get_hw_mode(priv, NL80211_BAND_2GHZ);
         if (supp_band) {
                 channels = supp_band->channels;
 
@@ -358,7 +358,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
                                         IEEE80211_CHAN_NO_IR ?
                                         "passive only" : "active/passive");
         }
-        supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
+        supp_band = iwl_get_hw_mode(priv, NL80211_BAND_5GHZ);
         if (supp_band) {
                 channels = supp_band->channels;