cfg80211: consolidate passive-scan and no-ibss flags

These two flags are used for the same purpose, just
combine them into a no-ir flag to annotate no initiating
radiation is allowed.

Old userspace sending either flag will have it treated as
the no-ir flag. To be considerate to older userspace we
also send both the no-ir flag and the old no-ibss flags.
Newer userspace will have to be aware of older kernels.

Update all places in the tree using these flags with the
following semantic patch:

@@
@@
-NL80211_RRF_PASSIVE_SCAN
+NL80211_RRF_NO_IR
@@
@@
-NL80211_RRF_NO_IBSS
+NL80211_RRF_NO_IR
@@
@@
-IEEE80211_CHAN_PASSIVE_SCAN
+IEEE80211_CHAN_NO_IR
@@
@@
-IEEE80211_CHAN_NO_IBSS
+IEEE80211_CHAN_NO_IR
@@
@@
-NL80211_RRF_NO_IR | NL80211_RRF_NO_IR
+NL80211_RRF_NO_IR
@@
@@
-IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_IR
+IEEE80211_CHAN_NO_IR
@@
@@
-(NL80211_RRF_NO_IR)
+NL80211_RRF_NO_IR
@@
@@
-(IEEE80211_CHAN_NO_IR)
+IEEE80211_CHAN_NO_IR

Along with some hand-optimisations in documentation, to
remove duplicates and to fix some indentation.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
[do all the driver updates in one go]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 19 insertions, 29 deletions

diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index d7d0d4948b01..8453c53143f5 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;
         }
 }