Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

29 files changed, 246 insertions, 230 deletions

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 97ac8c87cba2..06fe2b8fa22d 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(struct ath10k *ar)
                         ch->allow_vht = true;
 
                         ch->allow_ibss =
-                                !(channel->flags & IEEE80211_CHAN_NO_IBSS);
+                                !(channel->flags & IEEE80211_CHAN_NO_IR);
 
                         ch->ht40plus =
                                 !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
 
-                        passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
+                        passive = channel->flags & IEEE80211_CHAN_NO_IR;
                         ch->passive = passive;
 
                         ch->freq = channel->center_freq;
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 2437ad26949d..fd4c89df67e1 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -1109,7 +1109,9 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,
                                 (mode == WMI_11G_HT20) ?
                                         NL80211_CHAN_HT20 : NL80211_CHAN_NO_HT);
 
+        mutex_lock(&vif->wdev.mtx);
         cfg80211_ch_switch_notify(vif->ndev, &chandef);
+        mutex_unlock(&vif->wdev.mtx);
 }
 
 static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
@@ -3169,12 +3171,15 @@ static bool ath6kl_is_p2p_go_ssid(const u8 *buf, size_t len)
 }
 
 static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
-                          struct ieee80211_channel *chan, bool offchan,
-                          unsigned int wait, const u8 *buf, size_t len,
-                          bool no_cck, bool dont_wait_for_ack, u64 *cookie)
+                          struct cfg80211_mgmt_tx_params *params, u64 *cookie)
 {
         struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);
         struct ath6kl *ar = ath6kl_priv(vif->ndev);
+        struct ieee80211_channel *chan = params->chan;
+        const u8 *buf = params->buf;
+        size_t len = params->len;
+        unsigned int wait = params->wait;
+        bool no_cck = params->no_cck;
         u32 id, freq;
         const struct ieee80211_mgmt *mgmt;
         bool more_data, queued;
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 1217c52ab28e..d3bbf48522b6 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -37,17 +37,18 @@ static int __ath_regd_init(struct ath_regulatory *reg);
 
 /* We enable active scan on these a case by case basis by regulatory domain */
 #define ATH9K_2GHZ_CH12_13      REG_RULE(2467-10, 2472+10, 40, 0, 20,\
-                                        NL80211_RRF_PASSIVE_SCAN)
+                                         NL80211_RRF_NO_IR)
 #define ATH9K_2GHZ_CH14         REG_RULE(2484-10, 2484+10, 40, 0, 20,\
-                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
+                                         NL80211_RRF_NO_IR | \
+                                         NL80211_RRF_NO_OFDM)
 
 /* We allow IBSS on these on a case by case basis by regulatory domain */
 #define ATH9K_5GHZ_5150_5350    REG_RULE(5150-10, 5350+10, 80, 0, 30,\
-                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 #define ATH9K_5GHZ_5470_5850    REG_RULE(5470-10, 5850+10, 80, 0, 30,\
-                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 #define ATH9K_5GHZ_5725_5850    REG_RULE(5725-10, 5850+10, 80, 0, 30,\
-                                NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 
 #define ATH9K_2GHZ_ALL          ATH9K_2GHZ_CH01_11, \
                                 ATH9K_2GHZ_CH12_13, \
@@ -223,18 +224,11 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                  * default during init, prior to calling our
                                  * regulatory_hint().
                                  */
-                                if (!(reg_rule->flags &
-                                    NL80211_RRF_NO_IBSS))
-                                        ch->flags &=
-                                          ~IEEE80211_CHAN_NO_IBSS;
-                                if (!(reg_rule->flags &
-                                    NL80211_RRF_PASSIVE_SCAN))
-                                        ch->flags &=
-                                          ~IEEE80211_CHAN_PASSIVE_SCAN;
+                                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         } else {
                                 if (ch->beacon_found)
-                                        ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-                                          IEEE80211_CHAN_PASSIVE_SCAN);
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         }
                 }
         }
@@ -260,11 +254,11 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
          */
         if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                 ch = &sband->channels[11]; /* CH 12 */
-                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (ch->flags & IEEE80211_CHAN_NO_IR)
+                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                 ch = &sband->channels[12]; /* CH 13 */
-                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (ch->flags & IEEE80211_CHAN_NO_IR)
+                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                 return;
         }
 
@@ -278,17 +272,17 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
         ch = &sband->channels[11]; /* CH 12 */
         reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                        if (ch->flags & IEEE80211_CHAN_NO_IR)
+                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
         }
 
         ch = &sband->channels[12]; /* CH 13 */
         reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                        if (ch->flags & IEEE80211_CHAN_NO_IR)
+                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
         }
 }
 
@@ -320,8 +314,7 @@ static void ath_reg_apply_radar_flags(struct wiphy *wiphy)
                  */
                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
                         ch->flags |= IEEE80211_CHAN_RADAR |
-                                     IEEE80211_CHAN_NO_IBSS |
-                                     IEEE80211_CHAN_PASSIVE_SCAN;
+                                     IEEE80211_CHAN_NO_IR;
         }
 }
 
@@ -609,7 +602,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
         const struct ieee80211_regdomain *regd;
 
         wiphy->reg_notifier = reg_notifier;
-        wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+        wiphy->regulatory_flags |= REGULATORY_STRICT_REG;
 
         if (ath_is_world_regd(reg)) {
                 /*
@@ -617,7 +610,8 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
                  * saved on the wiphy orig_* parameters
                  */
                 regd = ath_world_regdomain(reg);
-                wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                           REGULATORY_COUNTRY_IE_FOLLOW_POWER;
         } else {
                 /*
                  * This gets applied in the case of the absence of CRDA,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 4a2293041821..d31803607259 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
                         struct ieee80211_channel *chan = request->channels[i];
 
                         if (chan->flags & (IEEE80211_CHAN_RADAR |
-                                           IEEE80211_CHAN_PASSIVE_SCAN))
+                                           IEEE80211_CHAN_NO_IR))
                                 continue;
 
                         chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 470a47f2b384..3966fe0fcfd9 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -202,9 +202,9 @@ static struct ieee80211_supported_band __wl_band_5ghz_a = {
 
 /* This is to override regulatory domains defined in cfg80211 module (reg.c)
  * By default world regulatory domain defined in reg.c puts the flags
- * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for
- * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't
- * start p2p operations on 5GHz channels. All the changes in world regulatory
+ * NL80211_RRF_NO_IR for 5GHz channels (for * 36..48 and 149..165).
+ * With respect to these flags, wpa_supplicant doesn't * start p2p
+ * operations on 5GHz channels. All the changes in world regulatory
  * domain are to be done here.
  */
 static const struct ieee80211_regdomain brcmf_regdom = {
@@ -3973,11 +3973,12 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
 
 static int
 brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
-                       struct ieee80211_channel *chan, bool offchan,
-                       unsigned int wait, const u8 *buf, size_t len,
-                       bool no_cck, bool dont_wait_for_ack, u64 *cookie)
+                       struct cfg80211_mgmt_tx_params *params, u64 *cookie)
 {
         struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct ieee80211_channel *chan = params->chan;
+        const u8 *buf = params->buf;
+        size_t len = params->len;
         const struct ieee80211_mgmt *mgmt;
         struct brcmf_cfg80211_vif *vif;
         s32 err = 0;
@@ -4341,7 +4342,7 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)
         wiphy->max_remain_on_channel_duration = 5000;
         brcmf_wiphy_pno_params(wiphy);
         brcmf_dbg(INFO, "Registering custom regulatory\n");
-        wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+        wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
         wiphy_apply_custom_regulatory(wiphy, &brcmf_regdom);
         err = wiphy_register(wiphy);
         if (err < 0) {
@@ -5197,10 +5198,10 @@ static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
                                         if (channel & WL_CHAN_RADAR)
                                                 band_chan_arr[index].flags |=
                                                         (IEEE80211_CHAN_RADAR |
-                                                        IEEE80211_CHAN_NO_IBSS);
+                                                        IEEE80211_CHAN_NO_IR);
                                         if (channel & WL_CHAN_PASSIVE)
                                                 band_chan_arr[index].flags |=
-                                                    IEEE80211_CHAN_PASSIVE_SCAN;
+                                                    IEEE80211_CHAN_NO_IR;
                                 }
                         }
                         if (!update)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index cc87926f5055..ef05df04136b 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -59,23 +59,18 @@
 
 #define BRCM_2GHZ_2412_2462     REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
 #define BRCM_2GHZ_2467_2472     REG_RULE(2467-10, 2472+10, 20, 0, 19, \
-                                         NL80211_RRF_PASSIVE_SCAN | \
-                                         NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 
 #define BRCM_5GHZ_5180_5240     REG_RULE(5180-10, 5240+10, 40, 0, 21, \
-                                         NL80211_RRF_PASSIVE_SCAN | \
-                                         NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 #define BRCM_5GHZ_5260_5320     REG_RULE(5260-10, 5320+10, 40, 0, 21, \
-                                         NL80211_RRF_PASSIVE_SCAN | \
                                          NL80211_RRF_DFS | \
-                                         NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 #define BRCM_5GHZ_5500_5700     REG_RULE(5500-10, 5700+10, 40, 0, 21, \
-                                         NL80211_RRF_PASSIVE_SCAN | \
                                          NL80211_RRF_DFS | \
-                                         NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 #define BRCM_5GHZ_5745_5825     REG_RULE(5745-10, 5825+10, 40, 0, 21, \
-                                         NL80211_RRF_PASSIVE_SCAN | \
-                                         NL80211_RRF_NO_IBSS)
+                                         NL80211_RRF_NO_IR)
 
 static const struct ieee80211_regdomain brcms_regdom_x2 = {
         .n_reg_rules = 6,
@@ -395,7 +390,7 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                 brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
 
         brcms_b_set_chanspec(wlc->hw, chanspec,
-                              !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
+                              !!(ch->flags & IEEE80211_CHAN_NO_IR),
                               &txpwr);
 }
 
@@ -657,8 +652,8 @@ static void brcms_reg_apply_radar_flags(struct wiphy *wiphy)
                  */
                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
                         ch->flags |= IEEE80211_CHAN_RADAR |
-                                     IEEE80211_CHAN_NO_IBSS |
-                                     IEEE80211_CHAN_PASSIVE_SCAN;
+                                     IEEE80211_CHAN_NO_IR |
+                                     IEEE80211_CHAN_NO_IR;
         }
 }
 
@@ -688,14 +683,10 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                 if (IS_ERR(rule))
                                         continue;
 
-                                if (!(rule->flags & NL80211_RRF_NO_IBSS))
-                                        ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
-                                if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                                        ch->flags &=
-                                                ~IEEE80211_CHAN_PASSIVE_SCAN;
+                                if (!(rule->flags & NL80211_RRF_NO_IR))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         } else if (ch->beacon_found) {
-                                ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-                                               IEEE80211_CHAN_PASSIVE_SCAN);
+                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         }
                 }
         }
@@ -775,8 +766,8 @@ void brcms_c_regd_init(struct brcms_c_info *wlc)
         }
 
         wlc->wiphy->reg_notifier = brcms_reg_notifier;
-        wlc->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
-                             WIPHY_FLAG_STRICT_REGULATORY;
+        wlc->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                        REGULATORY_STRICT_REG;
         wiphy_apply_custom_regulatory(wlc->wiphy, regd->regdomain);
         brcms_reg_apply_beaconing_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index edc5d105ff98..e71ce8c842a2 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -125,13 +125,13 @@ static struct ieee80211_channel brcms_2ghz_chantable[] = {
         CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
         CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
         CHAN2GHZ(12, 2467,
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                 IEEE80211_CHAN_NO_IR |
                  IEEE80211_CHAN_NO_HT40PLUS),
         CHAN2GHZ(13, 2472,
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                 IEEE80211_CHAN_NO_IR |
                  IEEE80211_CHAN_NO_HT40PLUS),
         CHAN2GHZ(14, 2484,
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                 IEEE80211_CHAN_NO_IR |
                  IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS |
                  IEEE80211_CHAN_NO_OFDM)
 };
@@ -144,51 +144,51 @@ static struct ieee80211_channel brcms_5ghz_nphy_chantable[] = {
         CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
         /* UNII-2 */
         CHAN5GHZ(52,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(56,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(60,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(64,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         /* MID */
         CHAN5GHZ(100,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(104,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(108,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(112,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(116,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(120,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(124,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(128,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(132,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
         CHAN5GHZ(136,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
         CHAN5GHZ(140,
-                 IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                 IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
+                 IEEE80211_CHAN_RADAR |
+                 IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS |
                  IEEE80211_CHAN_NO_HT40MINUS),
         /* UNII-3 */
         CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/cw1200/scan.c
index ee3c19037aac..8c017bfd2ffc 100644
--- a/drivers/net/wireless/cw1200/scan.c
+++ b/drivers/net/wireless/cw1200/scan.c
@@ -197,9 +197,9 @@ void cw1200_scan_work(struct work_struct *work)
                         if ((*it)->band != first->band)
                                 break;
                         if (((*it)->flags ^ first->flags) &
-                                        IEEE80211_CHAN_PASSIVE_SCAN)
+                                        IEEE80211_CHAN_NO_IR)
                                 break;
-                        if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+                        if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
                             (*it)->max_power != first->max_power)
                                 break;
                 }
@@ -210,7 +210,7 @@ void cw1200_scan_work(struct work_struct *work)
                 else
                         scan.max_tx_rate = WSM_TRANSMIT_RATE_1;
                 scan.num_probes =
-                        (first->flags & IEEE80211_CHAN_PASSIVE_SCAN) ? 0 : 2;
+                        (first->flags & IEEE80211_CHAN_NO_IR) ? 0 : 2;
                 scan.num_ssids = priv->scan.n_ssids;
                 scan.ssids = &priv->scan.ssids[0];
                 scan.num_channels = it - priv->scan.curr;
@@ -233,7 +233,7 @@ void cw1200_scan_work(struct work_struct *work)
                 }
                 for (i = 0; i < scan.num_channels; ++i) {
                         scan.ch[i].number = priv->scan.curr[i]->hw_value;
-                        if (priv->scan.curr[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
+                        if (priv->scan.curr[i]->flags & IEEE80211_CHAN_NO_IR) {
                                 scan.ch[i].min_chan_time = 50;
                                 scan.ch[i].max_chan_time = 100;
                         } else {
@@ -241,7 +241,7 @@ void cw1200_scan_work(struct work_struct *work)
                                 scan.ch[i].max_chan_time = 25;
                         }
                 }
-                if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+                if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
                     priv->scan.output_power != first->max_power) {
                         priv->scan.output_power = first->max_power;
                         wsm_set_output_power(priv,
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index f8ab193009cd..813c9af0ebd6 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1930,10 +1930,10 @@ static int ipw2100_wdev_init(struct net_device *dev)
                         bg_band->channels[i].max_power = geo->bg[i].max_power;
                         if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
                                 bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_PASSIVE_SCAN;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
                                 bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_NO_IBSS;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
                                 bg_band->channels[i].flags |=
                                         IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 81903e33d5b1..9244b3661d34 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11472,10 +11472,10 @@ static int ipw_wdev_init(struct net_device *dev)
                         bg_band->channels[i].max_power = geo->bg[i].max_power;
                         if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
                                 bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_PASSIVE_SCAN;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
                                 bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_NO_IBSS;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
                                 bg_band->channels[i].flags |=
                                         IEEE80211_CHAN_RADAR;
@@ -11511,10 +11511,10 @@ static int ipw_wdev_init(struct net_device *dev)
                         a_band->channels[i].max_power = geo->a[i].max_power;
                         if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY)
                                 a_band->channels[i].flags |=
-                                        IEEE80211_CHAN_PASSIVE_SCAN;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->a[i].flags & LIBIPW_CH_NO_IBSS)
                                 a_band->channels[i].flags |=
-                                        IEEE80211_CHAN_NO_IBSS;
+                                        IEEE80211_CHAN_NO_IR;
                         if (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT)
                                 a_band->channels[i].flags |=
                                         IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index dea3b50d68b9..5c3bcedd679b 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_priv *il, enum ieee80211_band band,
                  *  and use long active_dwell time.
                  */
                 if (!is_active || il_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
+                    (chan->flags & IEEE80211_CHAN_NO_IR)) {
                         scan_ch->type = 0;      /* passive */
                         if (IL_UCODE_API(il->ucode_ver) == 1)
                                 scan_ch->active_dwell =
@@ -3575,9 +3575,9 @@ il3945_setup_mac(struct il_priv *il)
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 
-        hw->wiphy->flags |=
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
-            WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                       REGULATORY_DISABLE_BEACON_HINTS;
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 3982ab76f375..43f488a8cda2 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_priv *il, struct ieee80211_vif *vif,
                 }
 
                 if (!is_active || il_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                    (chan->flags & IEEE80211_CHAN_NO_IR))
                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
                 else
                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
@@ -5778,9 +5778,9 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 
-        hw->wiphy->flags |=
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
-            WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                       REGULATORY_DISABLE_BEACON_HINTS;
 
         /*
          * For now, disable PS by default because it affects
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index b03e22ef5462..a27b14cfeaec 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3445,10 +3445,10 @@ il_init_geos(struct il_priv *il)
 
                 if (il_is_channel_valid(ch)) {
                         if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IR;
 
                         if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IR;
 
                         if (ch->flags & EEPROM_CHANNEL_RADAR)
                                 geo_ch->flags |= IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index eff26501d60a..3a487a3bb5de 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,
                                       flags & IEEE80211_CHAN_RADAR ?
                                       " (IEEE 802.11h required)" : "",
                                       ((channels[i].
-                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                        flags & IEEE80211_CHAN_NO_IR) ||
                                        (channels[i].
                                         flags & IEEE80211_CHAN_RADAR)) ? "" :
                                       ", IBSS",
                                       channels[i].
-                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      flags & IEEE80211_CHAN_NO_IR ?
                                       "passive only" : "active/passive");
         }
         supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
@@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,
                                       flags & IEEE80211_CHAN_RADAR ?
                                       " (IEEE 802.11h required)" : "",
                                       ((channels[i].
-                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                        flags & IEEE80211_CHAN_NO_IR) ||
                                        (channels[i].
                                         flags & IEEE80211_CHAN_RADAR)) ? "" :
                                       ", IBSS",
                                       channels[i].
-                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      flags & IEEE80211_CHAN_NO_IR ?
                                       "passive only" : "active/passive");
         }
         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index d94f8ab15004..f69301e505ee 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -352,12 +352,12 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
                                         channels[i].max_power,
                                         channels[i].flags & IEEE80211_CHAN_RADAR ?
                                         " (IEEE 802.11h required)" : "",
-                                        ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
+                                        ((channels[i].flags & IEEE80211_CHAN_NO_IR)
                                         || (channels[i].flags &
                                         IEEE80211_CHAN_RADAR)) ? "" :
                                         ", IBSS",
                                         channels[i].flags &
-                                        IEEE80211_CHAN_PASSIVE_SCAN ?
+                                        IEEE80211_CHAN_NO_IR ?
                                         "passive only" : "active/passive");
         }
         supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
@@ -375,12 +375,12 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
                                         channels[i].max_power,
                                         channels[i].flags & IEEE80211_CHAN_RADAR ?
                                         " (IEEE 802.11h required)" : "",
-                                        ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
+                                        ((channels[i].flags & IEEE80211_CHAN_NO_IR)
                                         || (channels[i].flags &
                                         IEEE80211_CHAN_RADAR)) ? "" :
                                         ", IBSS",
                                         channels[i].flags &
-                                        IEEE80211_CHAN_PASSIVE_SCAN ?
+                                        IEEE80211_CHAN_NO_IR ?
                                         "passive only" : "active/passive");
         }
         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index cae4d3182e33..217f1ca321a0 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -155,9 +155,9 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                         ARRAY_SIZE(iwlagn_iface_combinations_dualmode);
         }
 
-        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
-                            WIPHY_FLAG_DISABLE_BEACON_HINTS |
-                            WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                       REGULATORY_DISABLE_BEACON_HINTS;
 
 #ifdef CONFIG_PM_SLEEP
         if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 35e0ee8b4e5b..928f8640a0a7 100644
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -544,7 +544,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                 channel = chan->hw_value;
                 scan_ch->channel = cpu_to_le16(channel);
 
-                if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                if (!is_active || (chan->flags & IEEE80211_CHAN_NO_IR))
                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
                 else
                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index 4c887f365908..f4a6d317a023 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -614,10 +614,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                         channel->flags = IEEE80211_CHAN_NO_HT40;
 
                         if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
-                                channel->flags |= IEEE80211_CHAN_NO_IBSS;
+                                channel->flags |= IEEE80211_CHAN_NO_IR;
 
                         if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+                                channel->flags |= IEEE80211_CHAN_NO_IR;
 
                         if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
                                 channel->flags |= IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index b76a9a8fc0b3..2fab203d3027 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -223,10 +223,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                         channel->flags |= IEEE80211_CHAN_NO_160MHZ;
 
                 if (!(ch_flags & NVM_CHANNEL_IBSS))
-                        channel->flags |= IEEE80211_CHAN_NO_IBSS;
+                        channel->flags |= IEEE80211_CHAN_NO_IR;
 
                 if (!(ch_flags & NVM_CHANNEL_ACTIVE))
-                        channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+                        channel->flags |= IEEE80211_CHAN_NO_IR;
 
                 if (ch_flags & NVM_CHANNEL_RADAR)
                         channel->flags |= IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 74bc2c8af06d..b56c989ad784 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -199,9 +199,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
         if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 8)
                 hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
 
-        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
-                            WIPHY_FLAG_DISABLE_BEACON_HINTS |
-                            WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
+                                       REGULATORY_DISABLE_BEACON_HINTS;
 
         hw->wiphy->iface_combinations = iwl_mvm_iface_combinations;
         hw->wiphy->n_iface_combinations =
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index dff7592e1ff8..e0cd100b40cd 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -192,7 +192,7 @@ static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd,
         for (i = 0; i < cmd->channel_count; i++) {
                 chan->channel = cpu_to_le16(req->channels[i]->hw_value);
                 chan->type = cpu_to_le32(type);
-                if (req->channels[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                if (req->channels[i]->flags & IEEE80211_CHAN_NO_IR)
                         chan->type &= cpu_to_le32(~SCAN_CHANNEL_TYPE_ACTIVE);
                 chan->active_dwell = cpu_to_le16(active_dwell);
                 chan->passive_dwell = cpu_to_le16(passive_dwell);
@@ -642,7 +642,7 @@ static void iwl_build_channel_cfg(struct iwl_mvm *mvm,
                 channels->iter_count[index] = cpu_to_le16(1);
                 channels->iter_interval[index] = 0;
 
-                if (!(s_band->channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                if (!(s_band->channels[i].flags & IEEE80211_CHAN_NO_IR))
                         channels->type[index] |=
                                 cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_ACTIVE);
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 9df7bc91a26f..3f9a4c9ad77a 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -159,7 +159,7 @@ static const struct ieee80211_regdomain hwsim_world_regdom_custom_02 = {
         .reg_rules = {
                 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0),
                 REG_RULE(5725-10, 5850+10, 40, 0, 30,
-                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
+                         NL80211_RRF_NO_IR),
         }
 };
 
@@ -353,7 +353,6 @@ struct mac80211_hwsim_data {
         } ps;
         bool ps_poll_pending;
         struct dentry *debugfs;
-        struct dentry *debugfs_ps;
 
         struct sk_buff_head pending;    /* packets pending */
         /*
@@ -362,7 +361,6 @@ struct mac80211_hwsim_data {
          * radio can be in more then one group.
          */
         u64 group;
-        struct dentry *debugfs_group;
 
         int power_level;
 
@@ -1485,7 +1483,7 @@ static void hw_scan_work(struct work_struct *work)
                     req->channels[hwsim->scan_chan_idx]->center_freq);
 
         hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
-        if (hwsim->tmp_chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
+        if (hwsim->tmp_chan->flags & IEEE80211_CHAN_NO_IR ||
             !req->n_ssids) {
                 dwell = 120;
         } else {
@@ -1734,9 +1732,7 @@ static void mac80211_hwsim_free(void)
         spin_unlock_bh(&hwsim_radio_lock);
 
         list_for_each_entry_safe(data, tmpdata, &tmplist, list) {
-                debugfs_remove(data->debugfs_group);
-                debugfs_remove(data->debugfs_ps);
-                debugfs_remove(data->debugfs);
+                debugfs_remove_recursive(data->debugfs);
                 ieee80211_unregister_hw(data->hw);
                 device_release_driver(data->dev);
                 device_unregister(data->dev);
@@ -1893,6 +1889,17 @@ static int hwsim_fops_ps_write(void *dat, u64 val)
 DEFINE_SIMPLE_ATTRIBUTE(hwsim_fops_ps, hwsim_fops_ps_read, hwsim_fops_ps_write,
                         "%llu\n");
 
+static int hwsim_write_simulate_radar(void *dat, u64 val)
+{
+        struct mac80211_hwsim_data *data = dat;
+
+        ieee80211_radar_detected(data->hw);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(hwsim_simulate_radar, NULL,
+                        hwsim_write_simulate_radar, "%llu\n");
 
 static int hwsim_fops_group_read(void *dat, u64 *val)
 {
@@ -2193,11 +2200,28 @@ static const struct ieee80211_iface_limit hwsim_if_limits[] = {
         { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
 };
 
-static struct ieee80211_iface_combination hwsim_if_comb = {
-        .limits = hwsim_if_limits,
-        .n_limits = ARRAY_SIZE(hwsim_if_limits),
-        .max_interfaces = 2048,
-        .num_different_channels = 1,
+static const struct ieee80211_iface_limit hwsim_if_dfs_limits[] = {
+        { .max = 8, .types = BIT(NL80211_IFTYPE_AP) },
+};
+
+static struct ieee80211_iface_combination hwsim_if_comb[] = {
+        {
+                .limits = hwsim_if_limits,
+                .n_limits = ARRAY_SIZE(hwsim_if_limits),
+                .max_interfaces = 2048,
+                .num_different_channels = 1,
+        },
+        {
+                .limits = hwsim_if_dfs_limits,
+                .n_limits = ARRAY_SIZE(hwsim_if_dfs_limits),
+                .max_interfaces = 8,
+                .num_different_channels = 1,
+                .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+                                       BIT(NL80211_CHAN_WIDTH_20) |
+                                       BIT(NL80211_CHAN_WIDTH_40) |
+                                       BIT(NL80211_CHAN_WIDTH_80) |
+                                       BIT(NL80211_CHAN_WIDTH_160),
+        }
 };
 
 static int __init init_mac80211_hwsim(void)
@@ -2215,7 +2239,7 @@ static int __init init_mac80211_hwsim(void)
                 return -EINVAL;
 
         if (channels > 1) {
-                hwsim_if_comb.num_different_channels = channels;
+                hwsim_if_comb[0].num_different_channels = channels;
                 mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
                 mac80211_hwsim_ops.cancel_hw_scan =
                         mac80211_hwsim_cancel_hw_scan;
@@ -2295,13 +2319,15 @@ static int __init init_mac80211_hwsim(void)
                 hw->wiphy->n_addresses = 2;
                 hw->wiphy->addresses = data->addresses;
 
-                hw->wiphy->iface_combinations = &hwsim_if_comb;
-                hw->wiphy->n_iface_combinations = 1;
+                hw->wiphy->iface_combinations = hwsim_if_comb;
+                hw->wiphy->n_iface_combinations = ARRAY_SIZE(hwsim_if_comb);
 
                 if (channels > 1) {
                         hw->wiphy->max_scan_ssids = 255;
                         hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
                         hw->wiphy->max_remain_on_channel_duration = 1000;
+                        /* For channels > 1 DFS is not allowed */
+                        hw->wiphy->n_iface_combinations = 1;
                 }
 
                 INIT_DELAYED_WORK(&data->roc_done, hw_roc_done);
@@ -2325,7 +2351,8 @@ static int __init init_mac80211_hwsim(void)
                             IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
                             IEEE80211_HW_AMPDU_AGGREGATION |
                             IEEE80211_HW_WANT_MONITOR_VIF |
-                            IEEE80211_HW_QUEUE_CONTROL;
+                            IEEE80211_HW_QUEUE_CONTROL |
+                            IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
                 if (rctbl)
                         hw->flags |= IEEE80211_HW_SUPPORTS_RC_TABLE;
 
@@ -2385,6 +2412,7 @@ static int __init init_mac80211_hwsim(void)
                         sband->vht_cap.cap =
                                 IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
                                 IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ |
+                                IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
                                 IEEE80211_VHT_CAP_RXLDPC |
                                 IEEE80211_VHT_CAP_SHORT_GI_80 |
                                 IEEE80211_VHT_CAP_SHORT_GI_160 |
@@ -2427,46 +2455,53 @@ static int __init init_mac80211_hwsim(void)
                         break;
                 case HWSIM_REGTEST_WORLD_ROAM:
                         if (i == 0) {
-                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_CUSTOM_REG;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         }
                         break;
                 case HWSIM_REGTEST_CUSTOM_WORLD:
-                        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
                         wiphy_apply_custom_regulatory(hw->wiphy,
                                 &hwsim_world_regdom_custom_01);
                         break;
                 case HWSIM_REGTEST_CUSTOM_WORLD_2:
                         if (i == 0) {
-                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_CUSTOM_REG;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         } else if (i == 1) {
-                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_CUSTOM_REG;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_02);
                         }
                         break;
                 case HWSIM_REGTEST_STRICT_ALL:
-                        hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+                        hw->wiphy->regulatory_flags |= REGULATORY_STRICT_REG;
                         break;
                 case HWSIM_REGTEST_STRICT_FOLLOW:
                 case HWSIM_REGTEST_STRICT_AND_DRIVER_REG:
                         if (i == 0)
-                                hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_STRICT_REG;
                         break;
                 case HWSIM_REGTEST_ALL:
                         if (i == 0) {
-                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_CUSTOM_REG;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         } else if (i == 1) {
-                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_CUSTOM_REG;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_02);
                         } else if (i == 4)
-                                hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+                                hw->wiphy->regulatory_flags |=
+                                        REGULATORY_STRICT_REG;
                         break;
                 default:
                         break;
@@ -2533,16 +2568,18 @@ static int __init init_mac80211_hwsim(void)
 
                 data->debugfs = debugfs_create_dir("hwsim",
                                                    hw->wiphy->debugfsdir);
-                data->debugfs_ps = debugfs_create_file("ps", 0666,
-                                                       data->debugfs, data,
-                                                       &hwsim_fops_ps);
-                data->debugfs_group = debugfs_create_file("group", 0666,
-                                                        data->debugfs, data,
-                                                        &hwsim_fops_group);
+                debugfs_create_file("ps", 0666, data->debugfs, data,
+                                    &hwsim_fops_ps);
+                debugfs_create_file("group", 0666, data->debugfs, data,
+                                    &hwsim_fops_group);
+                if (channels == 1)
+                        debugfs_create_file("dfs_simulate_radar", 0222,
+                                            data->debugfs,
+                                            data, &hwsim_simulate_radar);
 
                 tasklet_hrtimer_init(&data->beacon_timer,
                                      mac80211_hwsim_beacon,
-                                     CLOCK_REALTIME, HRTIMER_MODE_ABS);
+                                     CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS);
 
                 list_add_tail(&data->list, &hwsim_radios);
         }
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index aeaea0e3b4c4..d9b7330c902f 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -50,24 +50,24 @@ static const struct ieee80211_regdomain mwifiex_world_regdom_custom = {
                 REG_RULE(2412-10, 2462+10, 40, 3, 20, 0),
                 /* Channel 12 - 13 */
                 REG_RULE(2467-10, 2472+10, 20, 3, 20,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
+                         NL80211_RRF_NO_IR),
                 /* Channel 14 */
                 REG_RULE(2484-10, 2484+10, 20, 3, 20,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
+                         NL80211_RRF_NO_IR |
                          NL80211_RRF_NO_OFDM),
                 /* Channel 36 - 48 */
                 REG_RULE(5180-10, 5240+10, 40, 3, 20,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
+                         NL80211_RRF_NO_IR),
                 /* Channel 149 - 165 */
                 REG_RULE(5745-10, 5825+10, 40, 3, 20,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
+                         NL80211_RRF_NO_IR),
                 /* Channel 52 - 64 */
                 REG_RULE(5260-10, 5320+10, 40, 3, 30,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
+                         NL80211_RRF_NO_IR |
                          NL80211_RRF_DFS),
                 /* Channel 100 - 140 */
                 REG_RULE(5500-10, 5700+10, 40, 3, 30,
-                         NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
+                         NL80211_RRF_NO_IR |
                          NL80211_RRF_DFS),
         }
 };
@@ -184,10 +184,10 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len)
  */
 static int
 mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
-                         struct ieee80211_channel *chan, bool offchan,
-                         unsigned int wait, const u8 *buf, size_t len,
-                         bool no_cck, bool dont_wait_for_ack, u64 *cookie)
+                         struct cfg80211_mgmt_tx_params *params, u64 *cookie)
 {
+        const u8 *buf = params->buf;
+        size_t len = params->len;
         struct sk_buff *skb;
         u16 pkt_len;
         const struct ieee80211_mgmt *mgmt;
@@ -1968,7 +1968,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
                 user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
                 user_scan_cfg->chan_list[i].radio_type = chan->band;
 
-                if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                if (chan->flags & IEEE80211_CHAN_NO_IR)
                         user_scan_cfg->chan_list[i].scan_type =
                                                 MWIFIEX_SCAN_TYPE_PASSIVE;
                 else
@@ -2702,9 +2702,10 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME |
                         WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |
                         WIPHY_FLAG_AP_UAPSD |
-                        WIPHY_FLAG_CUSTOM_REGULATORY |
-                        WIPHY_FLAG_STRICT_REGULATORY |
                         WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+        wiphy->regulatory_flags |=
+                        REGULATORY_CUSTOM_REG |
+                        REGULATORY_STRICT_REG;
 
         wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom);
 
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 8cf7d50a7603..0ed06646f19a 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -515,14 +515,14 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
                                 scan_chan_list[chan_idx].max_scan_time =
                                         cpu_to_le16((u16) user_scan_in->
                                         chan_list[0].scan_time);
-                        else if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        else if (ch->flags & IEEE80211_CHAN_NO_IR)
                                 scan_chan_list[chan_idx].max_scan_time =
                                         cpu_to_le16(adapter->passive_scan_time);
                         else
                                 scan_chan_list[chan_idx].max_scan_time =
                                         cpu_to_le16(adapter->active_scan_time);
 
-                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        if (ch->flags & IEEE80211_CHAN_NO_IR)
                                 scan_chan_list[chan_idx].chan_scan_mode_bitmap
                                         |= MWIFIEX_PASSIVE_SCAN;
                         else
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index d7d0d4948b01..89e36568e70f 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.c
@@ -59,30 +59,26 @@ static struct country_code_to_enum_rd allCountries[] = {
  */
 #define RTL819x_2GHZ_CH12_13    \
         REG_RULE(2467-10, 2472+10, 40, 0, 20,\
-        NL80211_RRF_PASSIVE_SCAN)
+                 NL80211_RRF_NO_IR)
 
 #define RTL819x_2GHZ_CH14       \
         REG_RULE(2484-10, 2484+10, 40, 0, 20, \
-        NL80211_RRF_PASSIVE_SCAN | \
-        NL80211_RRF_NO_OFDM)
+                 NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
 
 /* 5G chan 36 - chan 64*/
 #define RTL819x_5GHZ_5150_5350  \
         REG_RULE(5150-10, 5350+10, 40, 0, 30, \
-        NL80211_RRF_PASSIVE_SCAN | \
-        NL80211_RRF_NO_IBSS)
+                 NL80211_RRF_NO_IR)
 
 /* 5G chan 100 - chan 165*/
 #define RTL819x_5GHZ_5470_5850  \
         REG_RULE(5470-10, 5850+10, 40, 0, 30, \
-        NL80211_RRF_PASSIVE_SCAN | \
-        NL80211_RRF_NO_IBSS)
+                 NL80211_RRF_NO_IR)
 
 /* 5G chan 149 - chan 165*/
 #define RTL819x_5GHZ_5725_5850  \
         REG_RULE(5725-10, 5850+10, 40, 0, 30, \
-        NL80211_RRF_PASSIVE_SCAN | \
-        NL80211_RRF_NO_IBSS)
+                 NL80211_RRF_NO_IR)
 
 #define RTL819x_5GHZ_ALL        \
         (RTL819x_5GHZ_5150_5350, RTL819x_5GHZ_5470_5850)
@@ -185,16 +181,11 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                  *regulatory_hint().
                                  */
 
-                                if (!(reg_rule->flags & NL80211_RRF_NO_IBSS))
-                                        ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
-                                if (!(reg_rule->
-                                     flags & NL80211_RRF_PASSIVE_SCAN))
-                                        ch->flags &=
-                                            ~IEEE80211_CHAN_PASSIVE_SCAN;
+                                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         } else {
                                 if (ch->beacon_found)
-                                        ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-                                                  IEEE80211_CHAN_PASSIVE_SCAN);
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                         }
                 }
         }
@@ -219,11 +210,11 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
          */
         if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                 ch = &sband->channels[11];      /* CH 12 */
-                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (ch->flags & IEEE80211_CHAN_NO_IR)
+                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                 ch = &sband->channels[12];      /* CH 13 */
-                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (ch->flags & IEEE80211_CHAN_NO_IR)
+                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
                 return;
         }
 
@@ -237,17 +228,17 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
         ch = &sband->channels[11];      /* CH 12 */
         reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                        if (ch->flags & IEEE80211_CHAN_NO_IR)
+                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
         }
 
         ch = &sband->channels[12];      /* CH 13 */
         reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
+                        if (ch->flags & IEEE80211_CHAN_NO_IR)
+                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
         }
 }
 
@@ -284,8 +275,7 @@ static void _rtl_reg_apply_radar_flags(struct wiphy *wiphy)
                  */
                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
                         ch->flags |= IEEE80211_CHAN_RADAR |
-                            IEEE80211_CHAN_NO_IBSS |
-                            IEEE80211_CHAN_PASSIVE_SCAN;
+                                     IEEE80211_CHAN_NO_IR;
         }
 }
 
@@ -354,9 +344,9 @@ static int _rtl_regd_init_wiphy(struct rtl_regulatory *reg,
 
         wiphy->reg_notifier = reg_notifier;
 
-        wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
-        wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY;
-        wiphy->flags &= ~WIPHY_FLAG_DISABLE_BEACON_HINTS;
+        wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
+        wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG;
+        wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
 
         regd = _rtl_regdomain_select(reg);
         wiphy_apply_custom_regulatory(wiphy, regd);
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c
index 4a0bbb13806b..7541bd1a4a4b 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wl12xx/scan.c
@@ -47,7 +47,7 @@ static int wl1271_get_scan_channels(struct wl1271 *wl,
                      * In active scans, we only scan channels not
                      * marked as passive.
                      */
-                    (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) {
+                    (passive || !(flags & IEEE80211_CHAN_NO_IR))) {
                         wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
                                      req->channels[i]->band,
                                      req->channels[i]->center_freq);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 34d9dfff2ad3..9b2ecf52449f 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1688,7 +1688,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
 
                         if (channel->flags & (IEEE80211_CHAN_DISABLED |
                                               IEEE80211_CHAN_RADAR |
-                                              IEEE80211_CHAN_PASSIVE_SCAN))
+                                              IEEE80211_CHAN_NO_IR))
                                 continue;
 
                         ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch);
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 0368b9cbfb89..e9da47cead58 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -91,8 +91,7 @@ static void wl1271_reg_notify(struct wiphy *wiphy,
                         continue;
 
                 if (ch->flags & IEEE80211_CHAN_RADAR)
-                        ch->flags |= IEEE80211_CHAN_NO_IBSS |
-                                     IEEE80211_CHAN_PASSIVE_SCAN;
+                        ch->flags |= IEEE80211_CHAN_NO_IR;
 
         }
 
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index 7ed86203304b..1e3d51cd673a 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -188,16 +188,14 @@ wlcore_scan_get_channels(struct wl1271 *wl,
                 flags = req_channels[i]->flags;
 
                 if (force_passive)
-                        flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+                        flags |= IEEE80211_CHAN_NO_IR;
 
                 if ((req_channels[i]->band == band) &&
                     !(flags & IEEE80211_CHAN_DISABLED) &&
                     (!!(flags & IEEE80211_CHAN_RADAR) == radar) &&
                     /* if radar is set, we ignore the passive flag */
                     (radar ||
-                     !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {
-
-
+                     !!(flags & IEEE80211_CHAN_NO_IR) == passive)) {
                         if (flags & IEEE80211_CHAN_RADAR) {
                                 channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;
 
@@ -220,7 +218,7 @@ wlcore_scan_get_channels(struct wl1271 *wl,
                             (band == IEEE80211_BAND_2GHZ) &&
                             (channels[j].channel >= 12) &&
                             (channels[j].channel <= 14) &&
-                            (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+                            (flags & IEEE80211_CHAN_NO_IR) &&
                             !force_passive) {
                                 /* pactive channels treated as DFS */
                                 channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
@@ -243,8 +241,8 @@ wlcore_scan_get_channels(struct wl1271 *wl,
                                      max_dwell_time_active,
                                      flags & IEEE80211_CHAN_RADAR ?
                                         ", DFS" : "",
-                                     flags & IEEE80211_CHAN_PASSIVE_SCAN ?
-                                        ", PASSIVE" : "");
+                                     flags & IEEE80211_CHAN_NO_IR ?
+                                        ", NO-IR" : "");
                         j++;
                 }
         }