37 files changed, 197 insertions, 230 deletions

diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt
index 9551622d0a7b..356f791af574 100644
--- a/Documentation/networking/regulatory.txt
+++ b/Documentation/networking/regulatory.txt
@@ -159,10 +159,10 @@ struct ieee80211_regdomain mydriver_jp_regdom = {
                 REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),
                 /* IEEE 802.11a, channels 34..48 */
                 REG_RULE(5170-20, 5240+20, 40, 6, 20,
-                        NL80211_RRF_PASSIVE_SCAN),
+                        NL80211_RRF_NO_IR),
                 /* IEEE 802.11a, channels 52..64 */
                 REG_RULE(5260-20, 5320+20, 40, 6, 20,
-                        NL80211_RRF_NO_IBSS |
+                        NL80211_RRF_NO_IR|
                         NL80211_RRF_DFS),
         }
 };
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 0b1cc516e778..f23d61fda243 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/regd.c b/drivers/net/wireless/ath/regd.c
index c00687e05688..e93e517a699f 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;
         }