From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: linville@tuxdriver.com, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, janusz.dziedzic@tieto.com,
smihir@qti.qualcomm.com, tushnimb@qca.qualcomm.com,
"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Subject: [PATCH 10/14] mac80211: consolidate no-ibss and passive scan to no-ir
Date: Mon, 21 Oct 2013 19:22:34 +0200 [thread overview]
Message-ID: <1382376158-25586-11-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1382376158-25586-1-git-send-email-mcgrof@do-not-panic.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
net/mac80211/scan.c | 10 +++++-----
net/mac80211/tx.c | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 5ad66a8..c22cbb5 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
ieee80211_hw_config(local, 0);
if ((req->channels[0]->flags &
- IEEE80211_CHAN_PASSIVE_SCAN) ||
+ IEEE80211_CHAN_NO_IR) ||
!local->scan_req->n_ssids) {
next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
} else {
@@ -572,7 +572,7 @@ ieee80211_scan_get_channel_time(struct ieee80211_channel *chan)
* TODO: channel switching also consumes quite some time,
* add that delay as well to get a better estimation
*/
- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+ if (chan->flags & IEEE80211_CHAN_NO_IR)
return IEEE80211_PASSIVE_CHANNEL_TIME;
return IEEE80211_PROBE_DELAY + IEEE80211_CHANNEL_TIME;
}
@@ -696,7 +696,7 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local,
*
* In any case, it is not necessary for a passive scan.
*/
- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
+ if (chan->flags & IEEE80211_CHAN_NO_IR ||
!local->scan_req->n_ssids) {
*next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
local->next_scan_state = SCAN_DECISION;
@@ -881,7 +881,7 @@ int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
struct ieee80211_channel *tmp_ch =
&local->hw.wiphy->bands[band]->channels[i];
- if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
+ if (tmp_ch->flags & (IEEE80211_CHAN_NO_IR |
IEEE80211_CHAN_DISABLED))
continue;
@@ -895,7 +895,7 @@ int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
local->int_scan_req->n_channels = n_ch;
} else {
- if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
+ if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IR |
IEEE80211_CHAN_DISABLED)))
goto unlock;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 9993fcb..ff1ebbf 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1695,8 +1695,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
* radar detection by itself. We can do that later by adding a
* monitor flag interfaces used for AP support.
*/
- if ((chan->flags & (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_RADAR |
- IEEE80211_CHAN_PASSIVE_SCAN)))
+ if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)))
goto fail_rcu;
ieee80211_xmit(sdata, skb, chan->band);
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-21 17:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 17:22 [PATCH 00/14] wlan: consolidate passive-scan and no-ibss flags Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 01/14] cfg80211: " Luis R. Rodriguez
2013-10-28 14:42 ` Johannes Berg
2013-10-28 14:49 ` Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 02/14] ath: consolidate no-ibss and passive scan to no-ir Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 03/14] ath10k: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 04/14] brcm80211: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 05/14] ipw2x00: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 06/14] mac80211_hwsim: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 07/14] mwifiex: " Luis R. Rodriguez
2013-10-22 22:21 ` Bing Zhao
2013-10-21 17:22 ` [PATCH 08/14] iwlegacy: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 09/14] rtlwifi: " Luis R. Rodriguez
2013-10-21 17:22 ` Luis R. Rodriguez [this message]
2013-10-21 17:22 ` [PATCH 11/14] ti: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 12/14] cw1200: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 13/14] iwlwifi: " Luis R. Rodriguez
2013-10-21 17:22 ` [PATCH 14/14] cfg80211: remove internal passive-scan and no-ibss guards Luis R. Rodriguez
2013-10-31 16:34 ` [PATCH 00/14] wlan: consolidate passive-scan and no-ibss flags Johannes Berg
2013-10-31 16:42 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382376158-25586-11-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=janusz.dziedzic@tieto.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=smihir@qti.qualcomm.com \
--cc=tushnimb@qca.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).