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/net/wireless/debugfs.c b/net/wireless/debugfs.c
index 454157717efa..5d453916a417 100644
--- a/net/wireless/debugfs.c
+++ b/net/wireless/debugfs.c
@@ -69,7 +69,7 @@ static ssize_t ht40allow_map_read(struct file *file,
         struct wiphy *wiphy = file->private_data;
         char *buf;
         unsigned int offset = 0, buf_size = PAGE_SIZE, i, r;
-        enum ieee80211_band band;
+        enum nl80211_band band;
         struct ieee80211_supported_band *sband;
 
         buf = kzalloc(buf_size, GFP_KERNEL);
@@ -78,7 +78,7 @@ static ssize_t ht40allow_map_read(struct file *file,
 
         rtnl_lock();
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+        for (band = 0; band < NUM_NL80211_BANDS; band++) {
                 sband = wiphy->bands[band];
                 if (!sband)
                         continue;