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 11/14] ti: consolidate no-ibss and passive scan to no-ir
Date: Mon, 21 Oct 2013 19:22:35 +0200 [thread overview]
Message-ID: <1382376158-25586-12-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>
---
drivers/net/wireless/ti/wl12xx/scan.c | 2 +-
drivers/net/wireless/ti/wlcore/cmd.c | 2 +-
drivers/net/wireless/ti/wlcore/main.c | 3 +--
drivers/net/wireless/ti/wlcore/scan.c | 8 ++++----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c
index 4a0bbb1..7541bd1 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wl12xx/scan.c
@@ -47,7 +47,7 @@ static int wl1271_get_scan_channels(struct wl1271 *wl,
* In active scans, we only scan channels not
* marked as passive.
*/
- (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) {
+ (passive || !(flags & IEEE80211_CHAN_NO_IR))) {
wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
req->channels[i]->band,
req->channels[i]->center_freq);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 9e5416f8..fccd8a0 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1686,7 +1686,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
if (channel->flags & (IEEE80211_CHAN_DISABLED |
IEEE80211_CHAN_RADAR |
- IEEE80211_CHAN_PASSIVE_SCAN))
+ IEEE80211_CHAN_NO_IR))
continue;
ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch);
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index bbdd106..72ddc08 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -90,8 +90,7 @@ static void wl1271_reg_notify(struct wiphy *wiphy,
continue;
if (ch->flags & IEEE80211_CHAN_RADAR)
- ch->flags |= IEEE80211_CHAN_NO_IBSS |
- IEEE80211_CHAN_PASSIVE_SCAN;
+ ch->flags |= IEEE80211_CHAN_NO_IR;
}
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index 13e743d..e4e8978 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -166,14 +166,14 @@ wlcore_scan_get_channels(struct wl1271 *wl,
flags = req_channels[i]->flags;
if (force_passive)
- flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+ flags |= IEEE80211_CHAN_NO_IR;
if ((req_channels[i]->band == band) &&
!(flags & IEEE80211_CHAN_DISABLED) &&
(!!(flags & IEEE80211_CHAN_RADAR) == radar) &&
/* if radar is set, we ignore the passive flag */
(radar ||
- !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {
+ !!(flags & IEEE80211_CHAN_NO_IR) == passive)) {
if (flags & IEEE80211_CHAN_RADAR) {
@@ -198,7 +198,7 @@ wlcore_scan_get_channels(struct wl1271 *wl,
(band == IEEE80211_BAND_2GHZ) &&
(channels[j].channel >= 12) &&
(channels[j].channel <= 14) &&
- (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+ (flags & IEEE80211_CHAN_NO_IR) &&
!force_passive) {
/* pactive channels treated as DFS */
channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
@@ -221,7 +221,7 @@ wlcore_scan_get_channels(struct wl1271 *wl,
max_dwell_time_active,
flags & IEEE80211_CHAN_RADAR ?
", DFS" : "",
- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+ flags & IEEE80211_CHAN_NO_IR?
", PASSIVE" : "");
j++;
}
--
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 ` [PATCH 10/14] mac80211: " Luis R. Rodriguez
2013-10-21 17:22 ` Luis R. Rodriguez [this message]
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-12-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).