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, 5 insertions, 5 deletions

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 563bea050383..79f2a0a13db8 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -93,18 +93,18 @@ static inline void mesh_plink_fsm_restart(struct sta_info *sta)
 static u32 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_local *local = sdata->local;
-        enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
+        enum nl80211_band band = ieee80211_get_sdata_band(sdata);
         struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
         struct sta_info *sta;
         u32 erp_rates = 0, changed = 0;
         int i;
         bool short_slot = false;
 
-        if (band == IEEE80211_BAND_5GHZ) {
+        if (band == NL80211_BAND_5GHZ) {
                 /* (IEEE 802.11-2012 19.4.5) */
                 short_slot = true;
                 goto out;
-        } else if (band != IEEE80211_BAND_2GHZ)
+        } else if (band != NL80211_BAND_2GHZ)
                 goto out;
 
         for (i = 0; i < sband->n_bitrates; i++)
@@ -247,7 +247,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
         mgmt->u.action.u.self_prot.action_code = action;
 
         if (action != WLAN_SP_MESH_PEERING_CLOSE) {
-                enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
+                enum nl80211_band band = ieee80211_get_sdata_band(sdata);
 
                 /* capability info */
                 pos = skb_put(skb, 2);
@@ -385,7 +385,7 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata,
                                struct ieee802_11_elems *elems, bool insert)
 {
         struct ieee80211_local *local = sdata->local;
-        enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
+        enum nl80211_band band = ieee80211_get_sdata_band(sdata);
         struct ieee80211_supported_band *sband;
         u32 rates, basic_rates = 0, changed = 0;
         enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth;