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

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.

40 files changed, 178 insertions, 178 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
index 9de277c6c420..b79e38734f2f 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
@@ -158,7 +158,7 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
                          struct iwl_rxon_context *ctx);
 void iwl_set_flags_for_band(struct iwl_priv *priv,
                             struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
+                            enum nl80211_band band,
                             struct ieee80211_vif *vif);
 
 /* uCode */
@@ -186,7 +186,7 @@ int iwl_send_statistics_request(struct iwl_priv *priv,
                                 u8 flags, bool clear);
 
 static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
-                        struct iwl_priv *priv, enum ieee80211_band band)
+                        struct iwl_priv *priv, enum nl80211_band band)
 {
         return priv->hw->wiphy->bands[band];
 }
@@ -198,7 +198,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan);
 #endif
 
 /* rx */
-int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
+int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum nl80211_band band);
 void iwl_setup_rx_handlers(struct iwl_priv *priv);
 void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);
 
@@ -258,7 +258,7 @@ void iwl_cancel_scan_deferred_work(struct iwl_priv *priv);
 int __must_check iwl_scan_initiate(struct iwl_priv *priv,
                                    struct ieee80211_vif *vif,
                                    enum iwl_scan_type scan_type,
-                                   enum ieee80211_band band);
+                                   enum nl80211_band band);
 
 /* For faster active scanning, scan will move to the next channel if fewer than
  * PLCP_QUIET_THRESH packets are heard on this channel within
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;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
index 1a7ead753eee..8148df61a916 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
@@ -677,7 +677,7 @@ struct iwl_priv {
 
         struct iwl_hw_params hw_params;
 
-        enum ieee80211_band band;
+        enum nl80211_band band;
         u8 valid_contexts;
 
         void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
@@ -722,11 +722,11 @@ struct iwl_priv {
         unsigned long scan_start;
         unsigned long scan_start_tsf;
         void *scan_cmd;
-        enum ieee80211_band scan_band;
+        enum nl80211_band scan_band;
         struct cfg80211_scan_request *scan_request;
         struct ieee80211_vif *scan_vif;
         enum iwl_scan_type scan_type;
-        u8 scan_tx_ant[IEEE80211_NUM_BANDS];
+        u8 scan_tx_ant[NUM_NL80211_BANDS];
         u8 mgmt_tx_ant;
 
         /* max number of station keys */
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
index cc13c04063a5..f21732ec3b25 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
@@ -420,7 +420,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
                 .data = { &cmd, },
         };
 
-        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
+        cmd.band = priv->band == NL80211_BAND_2GHZ;
         ch = ch_switch->chandef.chan->hw_value;
         IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
                       ctx->active.channel, ch);
@@ -588,7 +588,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
 
         hcmd.data[0] = cmd;
 
-        cmd->band = priv->band == IEEE80211_BAND_2GHZ;
+        cmd->band = priv->band == NL80211_BAND_2GHZ;
         ch = ch_switch->chandef.chan->hw_value;
         IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
                       ctx->active.channel, ch);
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
index 1799469268ea..8dda52ae3bb5 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
@@ -94,7 +94,7 @@ void iwlagn_temperature(struct iwl_priv *priv)
         iwl_tt_handler(priv);
 }
 
-int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
+int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum nl80211_band band)
 {
         int idx = 0;
         int band_offset = 0;
@@ -105,7 +105,7 @@ int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
                 return idx;
         /* Legacy rate format, search for match in table */
         } else {
-                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 (iwl_rates[idx].plcp == (rate_n_flags & 0xFF))
@@ -878,7 +878,7 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)
         int i;
         u8 ind = ant;
 
-        if (priv->band == IEEE80211_BAND_2GHZ &&
+        if (priv->band == NL80211_BAND_2GHZ &&
             priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)
                 return 0;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
index c63ea79571ff..8c0719468d00 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
@@ -202,12 +202,12 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 
         hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
-        if (priv->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels)
-                priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-                        &priv->nvm_data->bands[IEEE80211_BAND_2GHZ];
-        if (priv->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels)
-                priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                        &priv->nvm_data->bands[IEEE80211_BAND_5GHZ];
+        if (priv->nvm_data->bands[NL80211_BAND_2GHZ].n_channels)
+                priv->hw->wiphy->bands[NL80211_BAND_2GHZ] =
+                        &priv->nvm_data->bands[NL80211_BAND_2GHZ];
+        if (priv->nvm_data->bands[NL80211_BAND_5GHZ].n_channels)
+                priv->hw->wiphy->bands[NL80211_BAND_5GHZ] =
+                        &priv->nvm_data->bands[NL80211_BAND_5GHZ];
 
         hw->wiphy->hw_version = priv->trans->hw_id;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
index 614716251c39..37b32a6f60fd 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
@@ -262,7 +262,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
         rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* In mac80211, rates for 5 GHz start at 0 */
-        if (info->band == IEEE80211_BAND_5GHZ)
+        if (info->band == NL80211_BAND_5GHZ)
                 rate += IWL_FIRST_OFDM_RATE;
         else if (rate >= IWL_FIRST_CCK_RATE && rate <= IWL_LAST_CCK_RATE)
                 rate_flags |= RATE_MCS_CCK_MSK;
@@ -1117,7 +1117,7 @@ static int iwl_init_drv(struct iwl_priv *priv)
 
         INIT_LIST_HEAD(&priv->calib_results);
 
-        priv->band = IEEE80211_BAND_2GHZ;
+        priv->band = NL80211_BAND_2GHZ;
 
         priv->plcp_delta_threshold = priv->lib->plcp_delta_threshold;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
index ee7505537c96..b95c2d76db33 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
@@ -599,7 +599,7 @@ static u32 rate_n_flags_from_tbl(struct iwl_priv *priv,
  * fill "search" or "active" tx mode table.
  */
 static int rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
-                                    enum ieee80211_band band,
+                                    enum nl80211_band band,
                                     struct iwl_scale_tbl_info *tbl,
                                     int *rate_idx)
 {
@@ -624,7 +624,7 @@ static int rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
         /* legacy rate format */
         if (!(rate_n_flags & RATE_MCS_HT_MSK)) {
                 if (num_of_ant == 1) {
-                        if (band == IEEE80211_BAND_5GHZ)
+                        if (band == NL80211_BAND_5GHZ)
                                 tbl->lq_type = LQ_A;
                         else
                                 tbl->lq_type = LQ_G;
@@ -802,7 +802,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
         if (!is_legacy(tbl->lq_type) && (!ht_possible || !scale_index)) {
                 switch_to_legacy = 1;
                 scale_index = rs_ht_to_legacy[scale_index];
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                if (lq_sta->band == NL80211_BAND_5GHZ)
                         tbl->lq_type = LQ_A;
                 else
                         tbl->lq_type = LQ_G;
@@ -821,7 +821,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
         /* Mask with station rate restriction */
         if (is_legacy(tbl->lq_type)) {
                 /* supp_rates has no CCK bits in A mode */
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                if (lq_sta->band == NL80211_BAND_5GHZ)
                         rate_mask  = (u16)(rate_mask &
                            (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
                 else
@@ -939,7 +939,7 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
         table = &lq_sta->lq;
         tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
         rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type, &rs_index);
-        if (priv->band == IEEE80211_BAND_5GHZ)
+        if (priv->band == NL80211_BAND_5GHZ)
                 rs_index -= IWL_FIRST_OFDM_RATE;
         mac_flags = info->status.rates[0].flags;
         mac_index = info->status.rates[0].idx;
@@ -952,7 +952,7 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
                  * mac80211 HT index is always zero-indexed; we need to move
                  * HT OFDM rates after CCK rates in 2.4 GHz band
                  */
-                if (priv->band == IEEE80211_BAND_2GHZ)
+                if (priv->band == NL80211_BAND_2GHZ)
                         mac_index += IWL_FIRST_OFDM_RATE;
         }
         /* Here we actually compare this rate to the latest LQ command */
@@ -2284,7 +2284,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
 
         /* mask with station rate restriction */
         if (is_legacy(tbl->lq_type)) {
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                if (lq_sta->band == NL80211_BAND_5GHZ)
                         /* supp_rates has no CCK bits in A mode */
                         rate_scale_index_msk = (u16) (rate_mask &
                                 (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
@@ -2721,7 +2721,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
         /* Get max rate if user set max rate */
         if (lq_sta) {
                 lq_sta->max_rate_idx = txrc->max_rate_idx;
-                if ((sband->band == IEEE80211_BAND_5GHZ) &&
+                if ((sband->band == NL80211_BAND_5GHZ) &&
                     (lq_sta->max_rate_idx != -1))
                         lq_sta->max_rate_idx += IWL_FIRST_OFDM_RATE;
                 if ((lq_sta->max_rate_idx < 0) ||
@@ -2763,11 +2763,11 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
         } else {
                 /* Check for invalid rates */
                 if ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) ||
-                                ((sband->band == IEEE80211_BAND_5GHZ) &&
+                                ((sband->band == NL80211_BAND_5GHZ) &&
                                  (rate_idx < IWL_FIRST_OFDM_RATE)))
                         rate_idx = rate_lowest_index(sband, sta);
                 /* On valid 5 GHz rate, adjust index */
-                else if (sband->band == IEEE80211_BAND_5GHZ)
+                else if (sband->band == NL80211_BAND_5GHZ)
                         rate_idx -= IWL_FIRST_OFDM_RATE;
                 info->control.rates[0].flags = 0;
         }
@@ -2880,7 +2880,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
 
         /* Set last_txrate_idx to lowest rate */
         lq_sta->last_txrate_idx = rate_lowest_index(sband, sta);
-        if (sband->band == IEEE80211_BAND_5GHZ)
+        if (sband->band == NL80211_BAND_5GHZ)
                 lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
         lq_sta->is_agg = 0;
 #ifdef CONFIG_MAC80211_DEBUGFS
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
index c5fe44584613..50c1e951dd2d 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
@@ -355,7 +355,7 @@ struct iwl_lq_sta {
         u8 action_counter;      /* # mode-switch actions tried */
         u8 is_green;
         u8 is_dup;
-        enum ieee80211_band band;
+        enum nl80211_band band;
 
         /* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */
         u32 supp_rates;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
index 52ab1e012e8f..dfa2041cfdac 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
@@ -686,7 +686,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
 
         memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
 
-        ieee80211_rx_napi(priv->hw, skb, priv->napi);
+        ieee80211_rx_napi(priv->hw, NULL, skb, priv->napi);
 }
 
 static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
@@ -834,7 +834,7 @@ static void iwlagn_rx_reply_rx(struct iwl_priv *priv,
         /* rx_status carries information about the packet to mac80211 */
         rx_status.mactime = le64_to_cpu(phy_res->timestamp);
         rx_status.band = (phy_res->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                                NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
         rx_status.freq =
                 ieee80211_channel_to_frequency(le16_to_cpu(phy_res->channel),
                                                rx_status.band);
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
index 2d47cb24c48b..b228552184b5 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
@@ -719,7 +719,7 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)
 void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
                          struct iwl_rxon_context *ctx)
 {
-        enum ieee80211_band band = ch->band;
+        enum nl80211_band band = ch->band;
         u16 channel = ch->hw_value;
 
         if ((le16_to_cpu(ctx->staging.channel) == channel) &&
@@ -727,7 +727,7 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
                 return;
 
         ctx->staging.channel = cpu_to_le16(channel);
-        if (band == IEEE80211_BAND_5GHZ)
+        if (band == NL80211_BAND_5GHZ)
                 ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;
         else
                 ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
@@ -740,10 +740,10 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
 
 void iwl_set_flags_for_band(struct iwl_priv *priv,
                             struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
+                            enum nl80211_band band,
                             struct ieee80211_vif *vif)
 {
-        if (band == IEEE80211_BAND_5GHZ) {
+        if (band == NL80211_BAND_5GHZ) {
                 ctx->staging.flags &=
                     ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
                       | RXON_FLG_CCK_MSK);
@@ -1476,7 +1476,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
 
         iwlagn_set_rxon_chain(priv, ctx);
 
-        if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ))
+        if (bss_conf->use_cts_prot && (priv->band != NL80211_BAND_5GHZ))
                 ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
         else
                 ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
index 81a2ddbe9569..d01766f16175 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
@@ -312,7 +312,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
                        scan_notif->tsf_high, scan_notif->status);
 
         IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
-                       (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
+                       (priv->scan_band == NL80211_BAND_2GHZ) ? "2.4" : "5.2",
                        jiffies_to_msecs(jiffies - priv->scan_start));
 
         /*
@@ -362,9 +362,9 @@ void iwl_setup_rx_scan_handlers(struct iwl_priv *priv)
 }
 
 static u16 iwl_get_active_dwell_time(struct iwl_priv *priv,
-                                     enum ieee80211_band band, u8 n_probes)
+                                     enum nl80211_band band, u8 n_probes)
 {
-        if (band == IEEE80211_BAND_5GHZ)
+        if (band == NL80211_BAND_5GHZ)
                 return IWL_ACTIVE_DWELL_TIME_52 +
                         IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
         else
@@ -431,9 +431,9 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
 }
 
 static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
-                                      enum ieee80211_band band)
+                                      enum nl80211_band band)
 {
-        u16 passive = (band == IEEE80211_BAND_2GHZ) ?
+        u16 passive = (band == NL80211_BAND_2GHZ) ?
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
             IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
 
@@ -442,7 +442,7 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
 
 /* Return valid, unused, channel for a passive scan to reset the RF */
 static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                        enum ieee80211_band band)
+                                        enum nl80211_band band)
 {
         struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
         struct iwl_rxon_context *ctx;
@@ -470,7 +470,7 @@ static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
 
 static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
                                           struct ieee80211_vif *vif,
-                                          enum ieee80211_band band,
+                                          enum nl80211_band band,
                                           struct iwl_scan_channel *scan_ch)
 {
         const struct ieee80211_supported_band *sband;
@@ -492,7 +492,7 @@ static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
                         cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
                 /* Set txpower levels to defaults */
                 scan_ch->dsp_atten = 110;
-                if (band == IEEE80211_BAND_5GHZ)
+                if (band == NL80211_BAND_5GHZ)
                         scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else
                         scan_ch->tx_gain = ((1 << 5) | (5 << 3));
@@ -505,7 +505,7 @@ static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
 
 static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                                      struct ieee80211_vif *vif,
-                                     enum ieee80211_band band,
+                                     enum nl80211_band band,
                                      u8 is_active, u8 n_probes,
                                      struct iwl_scan_channel *scan_ch)
 {
@@ -553,7 +553,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                  * power level:
                  * scan_ch->tx_gain = ((1 << 5) | (2 << 3)) | 3;
                  */
-                if (band == IEEE80211_BAND_5GHZ)
+                if (band == NL80211_BAND_5GHZ)
                         scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else
                         scan_ch->tx_gain = ((1 << 5) | (5 << 3));
@@ -636,7 +636,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         u32 rate_flags = 0;
         u16 cmd_len = 0;
         u16 rx_chain = 0;
-        enum ieee80211_band band;
+        enum nl80211_band band;
         u8 n_probes = 0;
         u8 rx_ant = priv->nvm_data->valid_rx_ant;
         u8 rate;
@@ -750,7 +750,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
 
         switch (priv->scan_band) {
-        case IEEE80211_BAND_2GHZ:
+        case NL80211_BAND_2GHZ:
                 scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
                 chan_mod = le32_to_cpu(
                         priv->contexts[IWL_RXON_CTX_BSS].active.flags &
@@ -771,7 +771,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
                     priv->lib->bt_params->advanced_bt_coexist)
                         scan->tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;
                 break;
-        case IEEE80211_BAND_5GHZ:
+        case NL80211_BAND_5GHZ:
                 rate = IWL_RATE_6M_PLCP;
                 break;
         default:
@@ -809,7 +809,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         band = priv->scan_band;
 
-        if (band == IEEE80211_BAND_2GHZ &&
+        if (band == NL80211_BAND_2GHZ &&
             priv->lib->bt_params &&
             priv->lib->bt_params->advanced_bt_coexist) {
                 /* transmit 2.4 GHz probes only on first antenna */
@@ -925,16 +925,16 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 void iwl_init_scan_params(struct iwl_priv *priv)
 {
         u8 ant_idx = fls(priv->nvm_data->valid_tx_ant) - 1;
-        if (!priv->scan_tx_ant[IEEE80211_BAND_5GHZ])
-                priv->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
-        if (!priv->scan_tx_ant[IEEE80211_BAND_2GHZ])
-                priv->scan_tx_ant[IEEE80211_BAND_2GHZ] = ant_idx;
+        if (!priv->scan_tx_ant[NL80211_BAND_5GHZ])
+                priv->scan_tx_ant[NL80211_BAND_5GHZ] = ant_idx;
+        if (!priv->scan_tx_ant[NL80211_BAND_2GHZ])
+                priv->scan_tx_ant[NL80211_BAND_2GHZ] = ant_idx;
 }
 
 int __must_check iwl_scan_initiate(struct iwl_priv *priv,
                                    struct ieee80211_vif *vif,
                                    enum iwl_scan_type scan_type,
-                                   enum ieee80211_band band)
+                                   enum nl80211_band band)
 {
         int ret;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
index 8e9768a553e4..de6ec9b7ace4 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
@@ -579,7 +579,7 @@ static void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
 
         /* Set up the rate scaling to start at selected rate, fall back
          * all the way down to 1M in IEEE order, and then spin on 1M */
-        if (priv->band == IEEE80211_BAND_5GHZ)
+        if (priv->band == NL80211_BAND_5GHZ)
                 r = IWL_RATE_6M_INDEX;
         else if (ctx && ctx->vif && ctx->vif->p2p)
                 r = IWL_RATE_6M_INDEX;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
index 59e2001c39f8..4b97371c3b42 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
@@ -81,7 +81,7 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
                 tx_flags |= TX_CMD_FLG_TSF_MSK;
         else if (ieee80211_is_back_req(fc))
                 tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;
-        else if (info->band == IEEE80211_BAND_2GHZ &&
+        else if (info->band == NL80211_BAND_2GHZ &&
                  priv->lib->bt_params &&
                  priv->lib->bt_params->advanced_bt_coexist &&
                  (ieee80211_is_auth(fc) || ieee80211_is_assoc_req(fc) ||
@@ -177,7 +177,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
                 rate_idx = rate_lowest_index(
                                 &priv->nvm_data->bands[info->band], sta);
         /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
-        if (info->band == IEEE80211_BAND_5GHZ)
+        if (info->band == NL80211_BAND_5GHZ)
                 rate_idx += IWL_FIRST_OFDM_RATE;
         /* Get PLCP rate for tx_cmd->rate_n_flags */
         rate_plcp = iwl_rates[rate_idx].plcp;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-1000.c b/drivers/net/wireless/intel/iwlwifi/iwl-1000.c
index ef22c3d168fc..5c2aae64d59f 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-1000.c
@@ -64,7 +64,7 @@ static const struct iwl_base_params iwl1000_base_params = {
 static const struct iwl_ht_params iwl1000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ),
 };
 
 static const struct iwl_eeprom_params iwl1000_eeprom_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-2000.c b/drivers/net/wireless/intel/iwlwifi/iwl-2000.c
index dc246c997084..2e823bdc4757 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-2000.c
@@ -89,7 +89,7 @@ static const struct iwl_base_params iwl2030_base_params = {
 static const struct iwl_ht_params iwl2000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ),
 };
 
 static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-5000.c b/drivers/net/wireless/intel/iwlwifi/iwl-5000.c
index 4dcdab6781cc..4c3e3cf4c799 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-5000.c
@@ -62,7 +62,7 @@ static const struct iwl_base_params iwl5000_base_params = {
 
 static const struct iwl_ht_params iwl5000_ht_params = {
         .ht_greenfield_support = true,
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 static const struct iwl_eeprom_params iwl5000_eeprom_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c
index 9938f5340ac0..5a7b7e1f0aab 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c
@@ -110,7 +110,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
 static const struct iwl_ht_params iwl6000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 static const struct iwl_eeprom_params iwl6000_eeprom_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
index b6283c881d42..abd2904ecc48 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
@@ -156,7 +156,7 @@ static const struct iwl_tt_params iwl7000_high_temp_tt_params = {
 
 static const struct iwl_ht_params iwl7000_ht_params = {
         .stbc = true,
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 #define IWL_DEVICE_7000_COMMON                                  \
@@ -287,7 +287,7 @@ static const struct iwl_pwr_tx_backoff iwl7265_pwr_tx_backoffs[] = {
 static const struct iwl_ht_params iwl7265_ht_params = {
         .stbc = true,
         .ldpc = true,
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 const struct iwl_cfg iwl3165_2ac_cfg = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 0728a288aa3d..a9212a12f4da 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -124,7 +124,7 @@ static const struct iwl_base_params iwl8000_base_params = {
 static const struct iwl_ht_params iwl8000_ht_params = {
         .stbc = true,
         .ldpc = true,
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 static const struct iwl_tt_params iwl8000_tt_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index a3d35aa291a9..b9aca3795f06 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -93,7 +93,7 @@ static const struct iwl_base_params iwl9000_base_params = {
 static const struct iwl_ht_params iwl9000_ht_params = {
         .stbc = true,
         .ldpc = true,
-        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+        .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
 };
 
 static const struct iwl_tt_params iwl9000_tt_params = {
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 08bb4f4e424a..720679889ab3 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -185,7 +185,7 @@ struct iwl_base_params {
  * @stbc: support Tx STBC and 1*SS Rx STBC
  * @ldpc: support Tx/Rx with LDPC
  * @use_rts_for_aggregation: use rts/cts protection for HT traffic
- * @ht40_bands: bitmap of bands (using %IEEE80211_BAND_*) that support HT40
+ * @ht40_bands: bitmap of bands (using %NL80211_BAND_*) that support HT40
  */
 struct iwl_ht_params {
         enum ieee80211_smps_mode smps_mode;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
index c15f5be85197..bf1b69aec813 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
@@ -390,10 +390,10 @@ iwl_eeprom_enh_txp_read_element(struct iwl_nvm_data *data,
                                 int n_channels, s8 max_txpower_avg)
 {
         int ch_idx;
-        enum ieee80211_band band;
+        enum nl80211_band band;
 
         band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?
-                IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+                NL80211_BAND_5GHZ : NL80211_BAND_2GHZ;
 
         for (ch_idx = 0; ch_idx < n_channels; ch_idx++) {
                 struct ieee80211_channel *chan = &data->channels[ch_idx];
@@ -526,7 +526,7 @@ static void iwl_init_band_reference(const struct iwl_cfg *cfg,
 
 static void iwl_mod_ht40_chan_info(struct device *dev,
                                    struct iwl_nvm_data *data, int n_channels,
-                                   enum ieee80211_band band, u16 channel,
+                                   enum nl80211_band band, u16 channel,
                                    const struct iwl_eeprom_channel *eeprom_ch,
                                    u8 clear_ht40_extension_channel)
 {
@@ -548,7 +548,7 @@ static void iwl_mod_ht40_chan_info(struct device *dev,
         IWL_DEBUG_EEPROM(dev,
                          "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
                          channel,
-                         band == IEEE80211_BAND_5GHZ ? "5.2" : "2.4",
+                         band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
                          CHECK_AND_PRINT(IBSS),
                          CHECK_AND_PRINT(ACTIVE),
                          CHECK_AND_PRINT(RADAR),
@@ -606,8 +606,8 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                         n_channels++;
 
                         channel->hw_value = eeprom_ch_array[ch_idx];
-                        channel->band = (band == 1) ? IEEE80211_BAND_2GHZ
-                                                    : IEEE80211_BAND_5GHZ;
+                        channel->band = (band == 1) ? NL80211_BAND_2GHZ
+                                                    : NL80211_BAND_5GHZ;
                         channel->center_freq =
                                 ieee80211_channel_to_frequency(
                                         channel->hw_value, channel->band);
@@ -677,15 +677,15 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
         /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
         for (band = 6; band <= 7; band++) {
-                enum ieee80211_band ieeeband;
+                enum nl80211_band ieeeband;
 
                 iwl_init_band_reference(cfg, eeprom, eeprom_size, band,
                                         &eeprom_ch_count, &eeprom_ch_info,
                                         &eeprom_ch_array);
 
                 /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
-                ieeeband = (band == 6) ? IEEE80211_BAND_2GHZ
-                                       : IEEE80211_BAND_5GHZ;
+                ieeeband = (band == 6) ? NL80211_BAND_2GHZ
+                                       : NL80211_BAND_5GHZ;
 
                 /* Loop through each band adding each of the channels */
                 for (ch_idx = 0; ch_idx < eeprom_ch_count; ch_idx++) {
@@ -708,7 +708,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
 int iwl_init_sband_channels(struct iwl_nvm_data *data,
                             struct ieee80211_supported_band *sband,
-                            int n_channels, enum ieee80211_band band)
+                            int n_channels, enum nl80211_band band)
 {
         struct ieee80211_channel *chan = &data->channels[0];
         int n = 0, idx = 0;
@@ -734,7 +734,7 @@ int iwl_init_sband_channels(struct iwl_nvm_data *data,
 void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
                           struct iwl_nvm_data *data,
                           struct ieee80211_sta_ht_cap *ht_info,
-                          enum ieee80211_band band,
+                          enum nl80211_band band,
                           u8 tx_chains, u8 rx_chains)
 {
         int max_bit_rate = 0;
@@ -813,22 +813,22 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
         int n_used = 0;
         struct ieee80211_supported_band *sband;
 
-        sband = &data->bands[IEEE80211_BAND_2GHZ];
-        sband->band = IEEE80211_BAND_2GHZ;
+        sband = &data->bands[NL80211_BAND_2GHZ];
+        sband->band = NL80211_BAND_2GHZ;
         sband->bitrates = &iwl_cfg80211_rates[RATES_24_OFFS];
         sband->n_bitrates = N_RATES_24;
         n_used += iwl_init_sband_channels(data, sband, n_channels,
-                                          IEEE80211_BAND_2GHZ);
-        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_2GHZ,
+                                          NL80211_BAND_2GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_2GHZ,
                              data->valid_tx_ant, data->valid_rx_ant);
 
-        sband = &data->bands[IEEE80211_BAND_5GHZ];
-        sband->band = IEEE80211_BAND_5GHZ;
+        sband = &data->bands[NL80211_BAND_5GHZ];
+        sband->band = NL80211_BAND_5GHZ;
         sband->bitrates = &iwl_cfg80211_rates[RATES_52_OFFS];
         sband->n_bitrates = N_RATES_52;
         n_used += iwl_init_sband_channels(data, sband, n_channels,
-                                          IEEE80211_BAND_5GHZ);
-        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ,
+                                          NL80211_BAND_5GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_5GHZ,
                              data->valid_tx_ant, data->valid_rx_ant);
 
         if (n_channels != n_used)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
index ad2b834668ff..53f39a34eca2 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
@@ -98,7 +98,7 @@ struct iwl_nvm_data {
         s8 max_tx_pwr_half_dbm;
 
         bool lar_enabled;
-        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+        struct ieee80211_supported_band bands[NUM_NL80211_BANDS];
         struct ieee80211_channel channels[];
 };
 
@@ -133,12 +133,12 @@ int iwl_nvm_check_version(struct iwl_nvm_data *data,
 
 int iwl_init_sband_channels(struct iwl_nvm_data *data,
                             struct ieee80211_supported_band *sband,
-                            int n_channels, enum ieee80211_band band);
+                            int n_channels, enum nl80211_band band);
 
 void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
                           struct iwl_nvm_data *data,
                           struct ieee80211_sta_ht_cap *ht_info,
-                          enum ieee80211_band band,
+                          enum nl80211_band band,
                           u8 tx_chains, u8 rx_chains);
 
 #endif /* __iwl_eeprom_parse_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 93a689583dff..14743c37d976 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -308,7 +308,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
                 channel->hw_value = nvm_chan[ch_idx];
                 channel->band = (ch_idx < num_2ghz_channels) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                                NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
                 channel->center_freq =
                         ieee80211_channel_to_frequency(
                                 channel->hw_value, channel->band);
@@ -320,7 +320,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                  * is not used in mvm, and is used for backwards compatibility
                  */
                 channel->max_power = IWL_DEFAULT_MAX_TX_POWER;
-                is_5ghz = channel->band == IEEE80211_BAND_5GHZ;
+                is_5ghz = channel->band == NL80211_BAND_5GHZ;
 
                 /* don't put limitations in case we're using LAR */
                 if (!lar_supported)
@@ -439,22 +439,22 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                                 &ch_section[NVM_CHANNELS_FAMILY_8000],
                                 lar_supported);
 
-        sband = &data->bands[IEEE80211_BAND_2GHZ];
-        sband->band = IEEE80211_BAND_2GHZ;
+        sband = &data->bands[NL80211_BAND_2GHZ];
+        sband->band = NL80211_BAND_2GHZ;
         sband->bitrates = &iwl_cfg80211_rates[RATES_24_OFFS];
         sband->n_bitrates = N_RATES_24;
         n_used += iwl_init_sband_channels(data, sband, n_channels,
-                                          IEEE80211_BAND_2GHZ);
-        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_2GHZ,
+                                          NL80211_BAND_2GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_2GHZ,
                              tx_chains, rx_chains);
 
-        sband = &data->bands[IEEE80211_BAND_5GHZ];
-        sband->band = IEEE80211_BAND_5GHZ;
+        sband = &data->bands[NL80211_BAND_5GHZ];
+        sband->band = NL80211_BAND_5GHZ;
         sband->bitrates = &iwl_cfg80211_rates[RATES_52_OFFS];
         sband->n_bitrates = N_RATES_52;
         n_used += iwl_init_sband_channels(data, sband, n_channels,
-                                          IEEE80211_BAND_5GHZ);
-        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ,
+                                          NL80211_BAND_5GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_5GHZ,
                              tx_chains, rx_chains);
         if (data->sku_cap_11ac_enable && !iwlwifi_mod_params.disable_11ac)
                 iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,
@@ -781,7 +781,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         struct ieee80211_regdomain *regd;
         int size_of_regd;
         struct ieee80211_reg_rule *rule;
-        enum ieee80211_band band;
+        enum nl80211_band band;
         int center_freq, prev_center_freq = 0;
         int valid_rules = 0;
         bool new_rule;
@@ -809,7 +809,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) {
                 ch_flags = (u16)__le32_to_cpup(channels + ch_idx);
                 band = (ch_idx < NUM_2GHZ_CHANNELS) ?
-                       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                       NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
                 center_freq = ieee80211_channel_to_frequency(nvm_chan[ch_idx],
                                                              band);
                 new_rule = false;
@@ -857,7 +857,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                 IWL_DEBUG_DEV(dev, IWL_DL_LAR,
                               "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x): Ad-Hoc %ssupported\n",
                               center_freq,
-                              band == IEEE80211_BAND_5GHZ ? "5.2" : "2.4",
+                              band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
                               CHECK_AND_PRINT_I(VALID),
                               CHECK_AND_PRINT_I(ACTIVE),
                               CHECK_AND_PRINT_I(RADAR),
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
index 35cdeca3d61e..a63f5bbb1ba7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
@@ -378,7 +378,7 @@ iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)
         chanctx_conf = rcu_dereference(vif->chanctx_conf);
 
         if (!chanctx_conf ||
-             chanctx_conf->def.chan->band != IEEE80211_BAND_2GHZ) {
+             chanctx_conf->def.chan->band != NL80211_BAND_2GHZ) {
                 rcu_read_unlock();
                 return BT_COEX_INVALID_LUT;
         }
@@ -537,7 +537,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
 
         /* If channel context is invalid or not on 2.4GHz .. */
         if ((!chanctx_conf ||
-             chanctx_conf->def.chan->band != IEEE80211_BAND_2GHZ)) {
+             chanctx_conf->def.chan->band != NL80211_BAND_2GHZ)) {
                 if (vif->type == NL80211_IFTYPE_STATION) {
                         /* ... relax constraints and disable rssi events */
                         iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX,
@@ -857,11 +857,11 @@ bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm)
 }
 
 bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,
-                                    enum ieee80211_band band)
+                                    enum nl80211_band band)
 {
         u32 bt_activity = le32_to_cpu(mvm->last_bt_notif.bt_activity_grading);
 
-        if (band != IEEE80211_BAND_2GHZ)
+        if (band != NL80211_BAND_2GHZ)
                 return false;
 
         return bt_activity >= BT_LOW_TRAFFIC;
@@ -873,7 +873,7 @@ u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
         __le16 fc = hdr->frame_control;
         bool mplut_enabled = iwl_mvm_is_mplut_supported(mvm);
 
-        if (info->band != IEEE80211_BAND_2GHZ)
+        if (info->band != NL80211_BAND_2GHZ)
                 return 0;
 
         if (unlikely(mvm->bt_tx_prio))
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index 3a279d3403ef..fb96bc00f022 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -724,9 +724,9 @@ static ssize_t iwl_dbgfs_tof_responder_params_write(struct ieee80211_vif *vif,
 
                 ret = kstrtou32(data, 10, &value);
                 if (ret == 0 && value) {
-                        enum ieee80211_band band = (cmd->channel_num <= 14) ?
-                                                   IEEE80211_BAND_2GHZ :
-                                                   IEEE80211_BAND_5GHZ;
+                        enum nl80211_band band = (cmd->channel_num <= 14) ?
+                                                   NL80211_BAND_2GHZ :
+                                                   NL80211_BAND_5GHZ;
                         struct ieee80211_channel chn = {
                                 .band = band,
                                 .center_freq = ieee80211_channel_to_frequency(
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 6ad5c602e84c..9e97cf4ff1c5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -980,7 +980,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                 goto error;
 
         /* Add all the PHY contexts */
-        chan = &mvm->hw->wiphy->bands[IEEE80211_BAND_2GHZ]->channels[0];
+        chan = &mvm->hw->wiphy->bands[NL80211_BAND_2GHZ]->channels[0];
         cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT);
         for (i = 0; i < NUM_PHY_CTX; i++) {
                 /*
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 5f950568e92c..456067b2f48d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -559,7 +559,7 @@ void iwl_mvm_mac_ctxt_release(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
 static void iwl_mvm_ack_rates(struct iwl_mvm *mvm,
                               struct ieee80211_vif *vif,
-                              enum ieee80211_band band,
+                              enum nl80211_band band,
                               u8 *cck_rates, u8 *ofdm_rates)
 {
         struct ieee80211_supported_band *sband;
@@ -730,7 +730,7 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
         rcu_read_lock();
         chanctx = rcu_dereference(vif->chanctx_conf);
         iwl_mvm_ack_rates(mvm, vif, chanctx ? chanctx->def.chan->band
-                                            : IEEE80211_BAND_2GHZ,
+                                            : NL80211_BAND_2GHZ,
                           &cck_ack_rates, &ofdm_ack_rates);
         rcu_read_unlock();
 
@@ -1065,7 +1065,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
                 cpu_to_le32(BIT(mvm->mgmt_last_antenna_idx) <<
                             RATE_MCS_ANT_POS);
 
-        if (info->band == IEEE80211_BAND_5GHZ || vif->p2p) {
+        if (info->band == NL80211_BAND_5GHZ || vif->p2p) {
                 rate = IWL_FIRST_OFDM_RATE;
         } else {
                 rate = IWL_FIRST_CCK_RATE;
@@ -1516,7 +1516,7 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,
         rx_status.device_timestamp = le32_to_cpu(sb->system_time);
         rx_status.band =
                 (sb->phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_BAND_24)) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                                NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
         rx_status.freq =
                 ieee80211_channel_to_frequency(le16_to_cpu(sb->channel),
                                                rx_status.band);
@@ -1526,5 +1526,5 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,
         memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
 
         /* pass it as regular rx to mac80211 */
-        ieee80211_rx_napi(mvm->hw, skb, NULL);
+        ieee80211_rx_napi(mvm->hw, NULL, skb, NULL);
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 4f5ec495b460..ef91b3770703 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -550,18 +550,18 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
         else
                 mvm->max_scans = IWL_MVM_MAX_LMAC_SCANS;
 
-        if (mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels)
-                hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-                        &mvm->nvm_data->bands[IEEE80211_BAND_2GHZ];
-        if (mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels) {
-                hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                        &mvm->nvm_data->bands[IEEE80211_BAND_5GHZ];
+        if (mvm->nvm_data->bands[NL80211_BAND_2GHZ].n_channels)
+                hw->wiphy->bands[NL80211_BAND_2GHZ] =
+                        &mvm->nvm_data->bands[NL80211_BAND_2GHZ];
+        if (mvm->nvm_data->bands[NL80211_BAND_5GHZ].n_channels) {
+                hw->wiphy->bands[NL80211_BAND_5GHZ] =
+                        &mvm->nvm_data->bands[NL80211_BAND_5GHZ];
 
                 if (fw_has_capa(&mvm->fw->ucode_capa,
                                 IWL_UCODE_TLV_CAPA_BEAMFORMER) &&
                     fw_has_api(&mvm->fw->ucode_capa,
                                IWL_UCODE_TLV_API_LQ_SS_PARAMS))
-                        hw->wiphy->bands[IEEE80211_BAND_5GHZ]->vht_cap.cap |=
+                        hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.cap |=
                                 IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE;
         }
 
@@ -2911,7 +2911,7 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,
                         cpu_to_le32(FW_CMD_ID_AND_COLOR(MAC_INDEX_AUX, 0)),
                 .sta_id_and_color = cpu_to_le32(mvm->aux_sta.sta_id),
                 /* Set the channel info data */
-                .channel_info.band = (channel->band == IEEE80211_BAND_2GHZ) ?
+                .channel_info.band = (channel->band == NL80211_BAND_2GHZ) ?
                         PHY_BAND_24 : PHY_BAND_5,
                 .channel_info.channel = channel->hw_value,
                 .channel_info.width = PHY_VHT_CHANNEL_MODE20,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 2d685e02d488..85800ba0c667 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1133,9 +1133,9 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm);
 
 /* Utils */
 int iwl_mvm_legacy_rate_to_mac80211_idx(u32 rate_n_flags,
-                                        enum ieee80211_band band);
+                                        enum nl80211_band band);
 void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,
-                               enum ieee80211_band band,
+                               enum nl80211_band band,
                                struct ieee80211_tx_rate *r);
 u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx);
 void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm);
@@ -1468,7 +1468,7 @@ bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,
 bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant);
 bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm);
 bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,
-                                    enum ieee80211_band band);
+                                    enum nl80211_band band);
 u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
                            struct ieee80211_tx_info *info, u8 ac);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
index 6e6a56f2153d..95138830b9f8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -147,7 +147,7 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
         u8 active_cnt, idle_cnt;
 
         /* Set the channel info data */
-        cmd->ci.band = (chandef->chan->band == IEEE80211_BAND_2GHZ ?
+        cmd->ci.band = (chandef->chan->band == NL80211_BAND_2GHZ ?
               PHY_BAND_24 : PHY_BAND_5);
 
         cmd->ci.channel = chandef->chan->hw_value;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index 61d0a8cd13f9..81dd2f6a48a5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@ -829,7 +829,7 @@ static u32 ucode_rate_from_rs_rate(struct iwl_mvm *mvm,
 
 /* Convert a ucode rate into an rs_rate object */
 static int rs_rate_from_ucode_rate(const u32 ucode_rate,
-                                   enum ieee80211_band band,
+                                   enum nl80211_band band,
                                    struct rs_rate *rate)
 {
         u32 ant_msk = ucode_rate & RATE_MCS_ANT_ABC_MSK;
@@ -848,7 +848,7 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
         if (!(ucode_rate & RATE_MCS_HT_MSK) &&
             !(ucode_rate & RATE_MCS_VHT_MSK)) {
                 if (num_of_ant == 1) {
-                        if (band == IEEE80211_BAND_5GHZ)
+                        if (band == NL80211_BAND_5GHZ)
                                 rate->type = LQ_LEGACY_A;
                         else
                                 rate->type = LQ_LEGACY_G;
@@ -1043,7 +1043,7 @@ static void rs_get_lower_rate_down_column(struct iwl_lq_sta *lq_sta,
                 return;
         } else if (is_siso(rate)) {
                 /* Downgrade to Legacy if we were in SISO */
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                if (lq_sta->band == NL80211_BAND_5GHZ)
                         rate->type = LQ_LEGACY_A;
                 else
                         rate->type = LQ_LEGACY_G;
@@ -1850,7 +1850,7 @@ static int rs_switch_to_column(struct iwl_mvm *mvm,
         rate->ant = column->ant;
 
         if (column->mode == RS_LEGACY) {
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                if (lq_sta->band == NL80211_BAND_5GHZ)
                         rate->type = LQ_LEGACY_A;
                 else
                         rate->type = LQ_LEGACY_G;
@@ -2020,7 +2020,7 @@ static void rs_get_adjacent_txp(struct iwl_mvm *mvm, int index,
 }
 
 static bool rs_tpc_allowed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                           struct rs_rate *rate, enum ieee80211_band band)
+                           struct rs_rate *rate, enum nl80211_band band)
 {
         int index = rate->index;
         bool cam = (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM);
@@ -2126,7 +2126,7 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm,
         struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
         struct ieee80211_vif *vif = mvm_sta->vif;
         struct ieee80211_chanctx_conf *chanctx_conf;
-        enum ieee80211_band band;
+        enum nl80211_band band;
         struct iwl_rate_scale_data *window;
         struct rs_rate *rate = &tbl->rate;
         enum tpc_action action;
@@ -2148,7 +2148,7 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm,
         rcu_read_lock();
         chanctx_conf = rcu_dereference(vif->chanctx_conf);
         if (WARN_ON(!chanctx_conf))
-                band = IEEE80211_NUM_BANDS;
+                band = NUM_NL80211_BANDS;
         else
                 band = chanctx_conf->def.chan->band;
         rcu_read_unlock();
@@ -2606,7 +2606,7 @@ static void rs_init_optimal_rate(struct iwl_mvm *mvm,
                 rate->type = lq_sta->is_vht ? LQ_VHT_MIMO2 : LQ_HT_MIMO2;
         else if (lq_sta->max_siso_rate_idx != IWL_RATE_INVALID)
                 rate->type = lq_sta->is_vht ? LQ_VHT_SISO : LQ_HT_SISO;
-        else if (lq_sta->band == IEEE80211_BAND_5GHZ)
+        else if (lq_sta->band == NL80211_BAND_5GHZ)
                 rate->type = LQ_LEGACY_A;
         else
                 rate->type = LQ_LEGACY_G;
@@ -2623,7 +2623,7 @@ static void rs_init_optimal_rate(struct iwl_mvm *mvm,
         } else {
                 lq_sta->optimal_rate_mask = lq_sta->active_legacy_rate;
 
-                if (lq_sta->band == IEEE80211_BAND_5GHZ) {
+                if (lq_sta->band == NL80211_BAND_5GHZ) {
                         lq_sta->optimal_rates = rs_optimal_rates_5ghz_legacy;
                         lq_sta->optimal_nentries =
                                 ARRAY_SIZE(rs_optimal_rates_5ghz_legacy);
@@ -2679,7 +2679,7 @@ static struct rs_rate *rs_get_optimal_rate(struct iwl_mvm *mvm,
 static void rs_get_initial_rate(struct iwl_mvm *mvm,
                                 struct ieee80211_sta *sta,
                                 struct iwl_lq_sta *lq_sta,
-                                enum ieee80211_band band,
+                                enum nl80211_band band,
                                 struct rs_rate *rate)
 {
         int i, nentries;
@@ -2714,7 +2714,7 @@ static void rs_get_initial_rate(struct iwl_mvm *mvm,
         rate->index = find_first_bit(&lq_sta->active_legacy_rate,
                                      BITS_PER_LONG);
 
-        if (band == IEEE80211_BAND_5GHZ) {
+        if (band == NL80211_BAND_5GHZ) {
                 rate->type = LQ_LEGACY_A;
                 initial_rates = rs_optimal_rates_5ghz_legacy;
                 nentries = ARRAY_SIZE(rs_optimal_rates_5ghz_legacy);
@@ -2814,7 +2814,7 @@ void rs_update_last_rssi(struct iwl_mvm *mvm,
 static void rs_initialize_lq(struct iwl_mvm *mvm,
                              struct ieee80211_sta *sta,
                              struct iwl_lq_sta *lq_sta,
-                             enum ieee80211_band band,
+                             enum nl80211_band band,
                              bool init)
 {
         struct iwl_scale_tbl_info *tbl;
@@ -3097,7 +3097,7 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg)
  * Called after adding a new station to initialize rate scaling
  */
 void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-                          enum ieee80211_band band, bool init)
+                          enum nl80211_band band, bool init)
 {
         int i, j;
         struct ieee80211_hw *hw = mvm->hw;
@@ -3203,7 +3203,7 @@ static void rs_rate_update(void *mvm_r,
 #ifdef CONFIG_MAC80211_DEBUGFS
 static void rs_build_rates_table_from_fixed(struct iwl_mvm *mvm,
                                             struct iwl_lq_cmd *lq_cmd,
-                                            enum ieee80211_band band,
+                                            enum nl80211_band band,
                                             u32 ucode_rate)
 {
         struct rs_rate rate;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.h b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
index bdb6f2d8d854..90d046fb24a0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
@@ -305,7 +305,7 @@ struct iwl_lq_sta {
         bool stbc_capable;      /* Tx STBC is supported by chip and Rx by STA */
         bool bfer_capable;      /* Remote supports beamformee and we BFer */
 
-        enum ieee80211_band band;
+        enum nl80211_band band;
 
         /* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */
         unsigned long active_legacy_rate;
@@ -358,7 +358,7 @@ struct iwl_lq_sta {
 
 /* Initialize station's rate scaling information after adding station */
 void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-                          enum ieee80211_band band, bool init);
+                          enum nl80211_band band, bool init);
 
 /* Notify RS about Tx status */
 void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 485cfc1a4daa..263e8a8576b7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -131,7 +131,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
                                 fraglen, rxb->truesize);
         }
 
-        ieee80211_rx_napi(mvm->hw, skb, napi);
+        ieee80211_rx_napi(mvm->hw, NULL, skb, napi);
 }
 
 /*
@@ -319,7 +319,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
         rx_status->device_timestamp = le32_to_cpu(phy_info->system_timestamp);
         rx_status->band =
                 (phy_info->phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_BAND_24)) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+                                NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
         rx_status->freq =
                 ieee80211_channel_to_frequency(le16_to_cpu(phy_info->channel),
                                                rx_status->band);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index b2bc3d96a13f..651604d18a32 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -210,7 +210,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
         if (iwl_mvm_check_pn(mvm, skb, queue, sta))
                 kfree_skb(skb);
         else
-                ieee80211_rx_napi(mvm->hw, skb, napi);
+                ieee80211_rx_napi(mvm->hw, NULL, skb, napi);
 }
 
 static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,
@@ -456,8 +456,8 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
 
         rx_status->mactime = le64_to_cpu(desc->tsf_on_air_rise);
         rx_status->device_timestamp = le32_to_cpu(desc->gp2_on_air_rise);
-        rx_status->band = desc->channel > 14 ? IEEE80211_BAND_5GHZ :
-                                               IEEE80211_BAND_2GHZ;
+        rx_status->band = desc->channel > 14 ? NL80211_BAND_5GHZ :
+                                               NL80211_BAND_2GHZ;
         rx_status->freq = ieee80211_channel_to_frequency(desc->channel,
                                                          rx_status->band);
         iwl_mvm_get_signal_strength(mvm, desc, rx_status);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index c1d1be9c5d01..6f609dd5c222 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -163,16 +163,16 @@ static inline __le16 iwl_mvm_scan_rx_chain(struct iwl_mvm *mvm)
         return cpu_to_le16(rx_chain);
 }
 
-static __le32 iwl_mvm_scan_rxon_flags(enum ieee80211_band band)
+static __le32 iwl_mvm_scan_rxon_flags(enum nl80211_band band)
 {
-        if (band == IEEE80211_BAND_2GHZ)
+        if (band == NL80211_BAND_2GHZ)
                 return cpu_to_le32(PHY_BAND_24);
         else
                 return cpu_to_le32(PHY_BAND_5);
 }
 
 static inline __le32
-iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum ieee80211_band band,
+iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum nl80211_band band,
                           bool no_cck)
 {
         u32 tx_ant;
@@ -182,7 +182,7 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum ieee80211_band band,
                                      mvm->scan_last_antenna_idx);
         tx_ant = BIT(mvm->scan_last_antenna_idx) << RATE_MCS_ANT_POS;
 
-        if (band == IEEE80211_BAND_2GHZ && !no_cck)
+        if (band == NL80211_BAND_2GHZ && !no_cck)
                 return cpu_to_le32(IWL_RATE_1M_PLCP | RATE_MCS_CCK_MSK |
                                    tx_ant);
         else
@@ -591,14 +591,14 @@ static void iwl_mvm_scan_fill_tx_cmd(struct iwl_mvm *mvm,
         tx_cmd[0].tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL |
                                          TX_CMD_FLG_BT_DIS);
         tx_cmd[0].rate_n_flags = iwl_mvm_scan_rate_n_flags(mvm,
-                                                           IEEE80211_BAND_2GHZ,
+                                                           NL80211_BAND_2GHZ,
                                                            no_cck);
         tx_cmd[0].sta_id = mvm->aux_sta.sta_id;
 
         tx_cmd[1].tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL |
                                          TX_CMD_FLG_BT_DIS);
         tx_cmd[1].rate_n_flags = iwl_mvm_scan_rate_n_flags(mvm,
-                                                           IEEE80211_BAND_5GHZ,
+                                                           NL80211_BAND_5GHZ,
                                                            no_cck);
         tx_cmd[1].sta_id = mvm->aux_sta.sta_id;
 }
@@ -695,19 +695,19 @@ iwl_mvm_build_scan_probe(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         /* Insert ds parameter set element on 2.4 GHz band */
         newpos = iwl_mvm_copy_and_insert_ds_elem(mvm,
-                                                 ies->ies[IEEE80211_BAND_2GHZ],
-                                                 ies->len[IEEE80211_BAND_2GHZ],
+                                                 ies->ies[NL80211_BAND_2GHZ],
+                                                 ies->len[NL80211_BAND_2GHZ],
                                                  pos);
         params->preq.band_data[0].offset = cpu_to_le16(pos - params->preq.buf);
         params->preq.band_data[0].len = cpu_to_le16(newpos - pos);
         pos = newpos;
 
-        memcpy(pos, ies->ies[IEEE80211_BAND_5GHZ],
-               ies->len[IEEE80211_BAND_5GHZ]);
+        memcpy(pos, ies->ies[NL80211_BAND_5GHZ],
+               ies->len[NL80211_BAND_5GHZ]);
         params->preq.band_data[1].offset = cpu_to_le16(pos - params->preq.buf);
         params->preq.band_data[1].len =
-                cpu_to_le16(ies->len[IEEE80211_BAND_5GHZ]);
-        pos += ies->len[IEEE80211_BAND_5GHZ];
+                cpu_to_le16(ies->len[NL80211_BAND_5GHZ]);
+        pos += ies->len[NL80211_BAND_5GHZ];
 
         memcpy(pos, ies->common_ies, ies->common_ie_len);
         params->preq.common_data.offset = cpu_to_le16(pos - params->preq.buf);
@@ -921,10 +921,10 @@ static __le32 iwl_mvm_scan_config_rates(struct iwl_mvm *mvm)
         unsigned int rates = 0;
         int i;
 
-        band = &mvm->nvm_data->bands[IEEE80211_BAND_2GHZ];
+        band = &mvm->nvm_data->bands[NL80211_BAND_2GHZ];
         for (i = 0; i < band->n_bitrates; i++)
                 rates |= rate_to_scan_rate_flag(band->bitrates[i].hw_value);
-        band = &mvm->nvm_data->bands[IEEE80211_BAND_5GHZ];
+        band = &mvm->nvm_data->bands[NL80211_BAND_5GHZ];
         for (i = 0; i < band->n_bitrates; i++)
                 rates |= rate_to_scan_rate_flag(band->bitrates[i].hw_value);
 
@@ -939,8 +939,8 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)
         struct iwl_scan_config *scan_config;
         struct ieee80211_supported_band *band;
         int num_channels =
-                mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels +
-                mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels;
+                mvm->nvm_data->bands[NL80211_BAND_2GHZ].n_channels +
+                mvm->nvm_data->bands[NL80211_BAND_5GHZ].n_channels;
         int ret, i, j = 0, cmd_size;
         struct iwl_host_cmd cmd = {
                 .id = iwl_cmd_id(SCAN_CFG_CMD, IWL_ALWAYS_LONG_GROUP, 0),
@@ -994,10 +994,10 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)
                                      IWL_CHANNEL_FLAG_EBS_ADD |
                                      IWL_CHANNEL_FLAG_PRE_SCAN_PASSIVE2ACTIVE;
 
-        band = &mvm->nvm_data->bands[IEEE80211_BAND_2GHZ];
+        band = &mvm->nvm_data->bands[NL80211_BAND_2GHZ];
         for (i = 0; i < band->n_channels; i++, j++)
                 scan_config->channel_array[j] = band->channels[i].hw_value;
-        band = &mvm->nvm_data->bands[IEEE80211_BAND_5GHZ];
+        band = &mvm->nvm_data->bands[NL80211_BAND_5GHZ];
         for (i = 0; i < band->n_channels; i++, j++)
                 scan_config->channel_array[j] = band->channels[i].hw_value;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
index 18711c5de35a..9f160fc58cd0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
@@ -444,7 +444,7 @@ iwl_mvm_tdls_config_channel_switch(struct iwl_mvm *mvm,
         }
 
         if (chandef) {
-                cmd.ci.band = (chandef->chan->band == IEEE80211_BAND_2GHZ ?
+                cmd.ci.band = (chandef->chan->band == NL80211_BAND_2GHZ ?
                                PHY_BAND_24 : PHY_BAND_5);
                 cmd.ci.channel = chandef->chan->hw_value;
                 cmd.ci.width = iwl_mvm_get_channel_width(chandef);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index efb9b98c4c98..bd286fca3776 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -359,7 +359,7 @@ void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,
                                 &mvm->nvm_data->bands[info->band], sta);
 
         /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
-        if (info->band == IEEE80211_BAND_5GHZ)
+        if (info->band == NL80211_BAND_5GHZ)
                 rate_idx += IWL_FIRST_OFDM_RATE;
 
         /* For 2.4 GHZ band, check that there is no need to remap */
@@ -372,7 +372,7 @@ void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,
                 iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm),
                                      mvm->mgmt_last_antenna_idx);
 
-        if (info->band == IEEE80211_BAND_2GHZ &&
+        if (info->band == NL80211_BAND_2GHZ &&
             !iwl_mvm_bt_coex_is_shared_ant_avail(mvm))
                 rate_flags = mvm->cfg->non_shared_ant << RATE_MCS_ANT_POS;
         else
@@ -1052,7 +1052,7 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status)
 #endif /* CONFIG_IWLWIFI_DEBUG */
 
 void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,
-                               enum ieee80211_band band,
+                               enum nl80211_band band,
                                struct ieee80211_tx_rate *r)
 {
         if (rate_n_flags & RATE_HT_MCS_GF_MSK)
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)