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

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0319d6d4f863..905003f75c4d 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -59,7 +59,7 @@ void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx)
         }
 }
 
-int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
+int ieee80211_frame_duration(enum nl80211_band band, size_t len,
                              int rate, int erp, int short_preamble,
                              int shift)
 {
@@ -77,7 +77,7 @@ int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
          * is assumed to be 0 otherwise.
          */
 
-        if (band == IEEE80211_BAND_5GHZ || erp) {
+        if (band == NL80211_BAND_5GHZ || erp) {
                 /*
                  * OFDM:
                  *
@@ -129,7 +129,7 @@ int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
 /* Exported duration function for driver use */
 __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
-                                        enum ieee80211_band band,
+                                        enum nl80211_band band,
                                         size_t frame_len,
                                         struct ieee80211_rate *rate)
 {
@@ -1129,7 +1129,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
         rcu_read_lock();
         chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
         use_11b = (chanctx_conf &&
-                   chanctx_conf->def.chan->band == IEEE80211_BAND_2GHZ) &&
+                   chanctx_conf->def.chan->band == NL80211_BAND_2GHZ) &&
                  !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
         rcu_read_unlock();
 
@@ -1301,7 +1301,7 @@ void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
 static int ieee80211_build_preq_ies_band(struct ieee80211_local *local,
                                          u8 *buffer, size_t buffer_len,
                                          const u8 *ie, size_t ie_len,
-                                         enum ieee80211_band band,
+                                         enum nl80211_band band,
                                          u32 rate_mask,
                                          struct cfg80211_chan_def *chandef,
                                          size_t *offset)
@@ -1375,7 +1375,7 @@ static int ieee80211_build_preq_ies_band(struct ieee80211_local *local,
                 pos += ext_rates_len;
         }
 
-        if (chandef->chan && sband->band == IEEE80211_BAND_2GHZ) {
+        if (chandef->chan && sband->band == NL80211_BAND_2GHZ) {
                 if (end - pos < 3)
                         goto out_err;
                 *pos++ = WLAN_EID_DS_PARAMS;
@@ -1479,7 +1479,7 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
 
         memset(ie_desc, 0, sizeof(*ie_desc));
 
-        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
+        for (i = 0; i < NUM_NL80211_BANDS; i++) {
                 if (bands_used & BIT(i)) {
                         pos += ieee80211_build_preq_ies_band(local,
                                                              buffer + pos,
@@ -1522,7 +1522,7 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
         struct sk_buff *skb;
         struct ieee80211_mgmt *mgmt;
         int ies_len;
-        u32 rate_masks[IEEE80211_NUM_BANDS] = {};
+        u32 rate_masks[NUM_NL80211_BANDS] = {};
         struct ieee80211_scan_ies dummy_ie_desc;
 
         /*
@@ -1582,7 +1582,7 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata,
 
 u32 ieee80211_sta_get_rates(struct ieee80211_sub_if_data *sdata,
                             struct ieee802_11_elems *elems,
-                            enum ieee80211_band band, u32 *basic_rates)
+                            enum nl80211_band band, u32 *basic_rates)
 {
         struct ieee80211_supported_band *sband;
         size_t num_rates;
@@ -2520,7 +2520,7 @@ int ieee80211_parse_bitrates(struct cfg80211_chan_def *chandef,
 
 int ieee80211_add_srates_ie(struct ieee80211_sub_if_data *sdata,
                             struct sk_buff *skb, bool need_basic,
-                            enum ieee80211_band band)
+                            enum nl80211_band band)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_supported_band *sband;
@@ -2565,7 +2565,7 @@ int ieee80211_add_srates_ie(struct ieee80211_sub_if_data *sdata,
 
 int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,
                                 struct sk_buff *skb, bool need_basic,
-                                enum ieee80211_band band)
+                                enum nl80211_band band)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_supported_band *sband;
@@ -2711,7 +2711,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
 
                 if (status->flag & RX_FLAG_MACTIME_PLCP_START) {
                         /* TODO: handle HT/VHT preambles */
-                        if (status->band == IEEE80211_BAND_5GHZ) {
+                        if (status->band == NL80211_BAND_5GHZ) {
                                 ts += 20 << shift;
                                 mpdu_offset += 2;
                         } else if (status->flag & RX_FLAG_SHORTPRE) {