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

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a7f4e7902104..41af3a0e9961 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -545,12 +545,12 @@ static int nl80211_msg_put_channel(struct sk_buff *msg,
         if ((chan->flags & IEEE80211_CHAN_DISABLED) &&
             nla_put_flag(msg, NL80211_FREQUENCY_ATTR_DISABLED))
                 goto nla_put_failure;
-        if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
-            nla_put_flag(msg, NL80211_FREQUENCY_ATTR_PASSIVE_SCAN))
-                goto nla_put_failure;
-        if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&
-            nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IBSS))
-                goto nla_put_failure;
+        if (chan->flags & IEEE80211_CHAN_NO_IR) {
+                if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IR))
+                        goto nla_put_failure;
+                if (nla_put_flag(msg, __NL80211_FREQUENCY_ATTR_NO_IBSS))
+                        goto nla_put_failure;
+        }
         if (chan->flags & IEEE80211_CHAN_RADAR) {
                 if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
                         goto nla_put_failure;