From: Eliad Peller <eliad@wizery.com>
To: Luciano Coelho <coelho@ti.com>
Cc: <linux-wireless@vger.kernel.org>
Subject: [PATCH 02/12] wl12xx: use dev_role_id for scans
Date: Mon, 30 Jan 2012 14:00:47 +0200 [thread overview]
Message-ID: <1327924857-1250-3-git-send-email-eliad@wizery.com> (raw)
In-Reply-To: <1327924857-1250-1-git-send-email-eliad@wizery.com>
Use device role for scans when the sta is not
associated.
Signed-off-by: Eliad Peller <eliad@wizery.com>
---
drivers/net/wireless/wl12xx/cmd.c | 3 ++-
drivers/net/wireless/wl12xx/main.c | 2 +-
drivers/net/wireless/wl12xx/scan.c | 16 ++++++++++++----
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 28e0a56..10dba19 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -1029,7 +1029,8 @@ int wl1271_cmd_template_set(struct wl1271 *wl, u8 role_id,
struct wl1271_cmd_template_set *cmd;
int ret = 0;
- wl1271_debug(DEBUG_CMD, "cmd template_set %d", template_id);
+ wl1271_debug(DEBUG_CMD, "cmd template_set %d (role %d)",
+ template_id, role_id);
WARN_ON(buf_len > WL1271_CMD_TEMPL_MAX_SIZE);
buf_len = min_t(size_t, buf_len, WL1271_CMD_TEMPL_MAX_SIZE);
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 0509816..51059a8 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3042,7 +3042,7 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
/* cancel ROC before scanning */
if (wl12xx_dev_role_started(wlvif))
- wl12xx_stop_dev(wl, wlvif);
+ wl12xx_croc(wl, wlvif->dev_role_id);
ret = wl1271_scan(hw->priv, vif, ssid, len, req);
out_sleep:
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 416ae91..3e3f2f5 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -77,7 +77,10 @@ void wl1271_scan_complete_work(struct work_struct *work)
(is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
!test_bit(wlvif->dev_role_id, wl->roc_map)) {
/* restore remain on channel */
- wl12xx_start_dev(wl, wlvif);
+ if (wlvif->dev_hlid == WL12XX_INVALID_LINK_ID)
+ wl12xx_start_dev(wl, wlvif);
+ else
+ wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
}
wl1271_ps_elp_sleep(wl);
@@ -185,11 +188,16 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif,
if (passive)
scan_options |= WL1271_SCAN_OPT_PASSIVE;
- if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID)) {
+ if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID ||
+ wlvif->dev_role_id == WL12XX_INVALID_ROLE_ID)) {
ret = -EINVAL;
goto out;
}
- cmd->params.role_id = wlvif->role_id;
+ if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
+ cmd->params.role_id = wlvif->role_id;
+ else
+ cmd->params.role_id = wlvif->dev_role_id;
+
cmd->params.scan_options = cpu_to_le16(scan_options);
cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,
@@ -218,7 +226,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif,
memcpy(cmd->addr, vif->addr, ETH_ALEN);
ret = wl12xx_cmd_build_probe_req(wl, wlvif,
- wlvif->role_id, band,
+ cmd->params.role_id, band,
wl->scan.ssid, wl->scan.ssid_len,
wl->scan.req->ie,
wl->scan.req->ie_len);
--
1.7.6.401.g6a319
next prev parent reply other threads:[~2012-01-30 11:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 12:00 [PATCH 00/12] wl12xx: update fw api Eliad Peller
2012-01-30 12:00 ` [PATCH 01/12] wl12xx: fw api change - add role_id to set_template Eliad Peller
2012-01-30 19:53 ` Luciano Coelho
2012-01-31 9:40 ` Eliad Peller
2012-01-30 12:00 ` Eliad Peller [this message]
2012-01-30 12:00 ` [PATCH 03/12] wl12xx: use dev_role_id for sched scan Eliad Peller
2012-01-30 19:47 ` Luciano Coelho
2012-01-30 12:00 ` [PATCH 04/12] wl12xx: fw api change - add role_id to tsf_info Eliad Peller
2012-01-30 12:00 ` [PATCH 05/12] wl12xx: fw api change - update cmd/acx/event enums Eliad Peller
2012-01-30 12:00 ` [PATCH 06/12] wl12xx: Driver-FW API changes Eliad Peller
2012-01-30 19:48 ` Luciano Coelho
2012-01-30 12:00 ` [PATCH 07/12] wl12xx: remove PS management code Eliad Peller
2012-01-30 12:00 ` [PATCH 08/12] wl12xx: add support for HW dynamic PS Eliad Peller
2012-01-30 12:00 ` [PATCH 09/12] wl12xx: add dynamic_ps_timeout debugfs file Eliad Peller
2012-01-30 12:00 ` [PATCH 10/12] wl12xx: remove 2 unused parameters in wl1271_ps_set_mode() Eliad Peller
2012-01-30 12:00 ` [PATCH 11/12] wl12xx: enable/disable BET with AUTO_PS/ACTIVE Eliad Peller
2012-01-30 12:00 ` [PATCH 12/12] wl12xx: change WLVIF_FLAG_PSM name and remove WLVIF_FLAG_PSM_REQUESTED Eliad Peller
2012-01-30 13:29 ` [PATCH 00/12] wl12xx: update fw api Kalle Valo
2012-01-30 13:52 ` Eliad Peller
2012-01-30 13:55 ` Luciano Coelho
2012-01-30 19:59 ` Luciano Coelho
2012-01-31 7:50 ` Kalle Valo
2012-01-31 9:43 ` Eliad Peller
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=1327924857-1250-3-git-send-email-eliad@wizery.com \
--to=eliad@wizery.com \
--cc=coelho@ti.com \
--cc=linux-wireless@vger.kernel.org \
/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).