diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-10-21 13:22:25 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-11-25 14:49:35 -0500 |
commit | 8fe02e167efa8ed4a4503a5eedc0f49fcb7e3eb9 (patch) | |
tree | 751497c11ae0b02cd90113a379e1fc35c84783ac /drivers/net/wireless/iwlegacy/debug.c | |
parent | c17bff87bed4bda1835ee41dc908e926414d8d85 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/debug.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/debug.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, | |||
567 | flags & IEEE80211_CHAN_RADAR ? | 567 | flags & IEEE80211_CHAN_RADAR ? |
568 | " (IEEE 802.11h required)" : "", | 568 | " (IEEE 802.11h required)" : "", |
569 | ((channels[i]. | 569 | ((channels[i]. |
570 | flags & IEEE80211_CHAN_NO_IBSS) || | 570 | flags & IEEE80211_CHAN_NO_IR) || |
571 | (channels[i]. | 571 | (channels[i]. |
572 | flags & IEEE80211_CHAN_RADAR)) ? "" : | 572 | flags & IEEE80211_CHAN_RADAR)) ? "" : |
573 | ", IBSS", | 573 | ", IBSS", |
574 | channels[i]. | 574 | channels[i]. |
575 | flags & IEEE80211_CHAN_PASSIVE_SCAN ? | 575 | flags & IEEE80211_CHAN_NO_IR ? |
576 | "passive only" : "active/passive"); | 576 | "passive only" : "active/passive"); |
577 | } | 577 | } |
578 | supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ); | 578 | 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, | |||
594 | flags & IEEE80211_CHAN_RADAR ? | 594 | flags & IEEE80211_CHAN_RADAR ? |
595 | " (IEEE 802.11h required)" : "", | 595 | " (IEEE 802.11h required)" : "", |
596 | ((channels[i]. | 596 | ((channels[i]. |
597 | flags & IEEE80211_CHAN_NO_IBSS) || | 597 | flags & IEEE80211_CHAN_NO_IR) || |
598 | (channels[i]. | 598 | (channels[i]. |
599 | flags & IEEE80211_CHAN_RADAR)) ? "" : | 599 | flags & IEEE80211_CHAN_RADAR)) ? "" : |
600 | ", IBSS", | 600 | ", IBSS", |
601 | channels[i]. | 601 | channels[i]. |
602 | flags & IEEE80211_CHAN_PASSIVE_SCAN ? | 602 | flags & IEEE80211_CHAN_NO_IR ? |
603 | "passive only" : "active/passive"); | 603 | "passive only" : "active/passive"); |
604 | } | 604 | } |
605 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 605 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); |