diff options
author | Eliad Peller <eliad@wizery.com> | 2012-01-31 04:57:17 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 01:38:30 -0500 |
commit | c059beb2adbf632748ac63ea829c69437575761a (patch) | |
tree | c207421eba3b0a007285560774af6707e7b64a79 | |
parent | cdaac6281170ee2934ad443cb60fbdd6cf318b64 (diff) |
wl12xx: use dev_role_id for scans
Use device role for scans when the sta is not
associated.
sched_scan is used only when the sta is
not associated, and thus should use
the dev role (instead of sta role).
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/cmd.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/scan.c | 20 |
3 files changed, 17 insertions, 8 deletions
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c index 28e0a56d794f..10dba19f3eb3 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, | |||
1029 | struct wl1271_cmd_template_set *cmd; | 1029 | struct wl1271_cmd_template_set *cmd; |
1030 | int ret = 0; | 1030 | int ret = 0; |
1031 | 1031 | ||
1032 | wl1271_debug(DEBUG_CMD, "cmd template_set %d", template_id); | 1032 | wl1271_debug(DEBUG_CMD, "cmd template_set %d (role %d)", |
1033 | template_id, role_id); | ||
1033 | 1034 | ||
1034 | WARN_ON(buf_len > WL1271_CMD_TEMPL_MAX_SIZE); | 1035 | WARN_ON(buf_len > WL1271_CMD_TEMPL_MAX_SIZE); |
1035 | buf_len = min_t(size_t, buf_len, WL1271_CMD_TEMPL_MAX_SIZE); | 1036 | 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 e4549dfb70d4..d16ea7a528a2 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -3070,7 +3070,7 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw, | |||
3070 | 3070 | ||
3071 | /* cancel ROC before scanning */ | 3071 | /* cancel ROC before scanning */ |
3072 | if (wl12xx_dev_role_started(wlvif)) | 3072 | if (wl12xx_dev_role_started(wlvif)) |
3073 | wl12xx_stop_dev(wl, wlvif); | 3073 | wl12xx_croc(wl, wlvif->dev_role_id); |
3074 | 3074 | ||
3075 | ret = wl1271_scan(hw->priv, vif, ssid, len, req); | 3075 | ret = wl1271_scan(hw->priv, vif, ssid, len, req); |
3076 | out_sleep: | 3076 | out_sleep: |
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index 416ae9145d61..6adc7333b7e6 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) | |||
77 | (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) && | 77 | (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) && |
78 | !test_bit(wlvif->dev_role_id, wl->roc_map)) { | 78 | !test_bit(wlvif->dev_role_id, wl->roc_map)) { |
79 | /* restore remain on channel */ | 79 | /* restore remain on channel */ |
80 | wl12xx_start_dev(wl, wlvif); | 80 | if (wlvif->dev_hlid == WL12XX_INVALID_LINK_ID) |
81 | wl12xx_start_dev(wl, wlvif); | ||
82 | else | ||
83 | wl12xx_roc(wl, wlvif, wlvif->dev_role_id); | ||
81 | } | 84 | } |
82 | wl1271_ps_elp_sleep(wl); | 85 | wl1271_ps_elp_sleep(wl); |
83 | 86 | ||
@@ -185,11 +188,16 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, | |||
185 | if (passive) | 188 | if (passive) |
186 | scan_options |= WL1271_SCAN_OPT_PASSIVE; | 189 | scan_options |= WL1271_SCAN_OPT_PASSIVE; |
187 | 190 | ||
188 | if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID)) { | 191 | if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID || |
192 | wlvif->dev_role_id == WL12XX_INVALID_ROLE_ID)) { | ||
189 | ret = -EINVAL; | 193 | ret = -EINVAL; |
190 | goto out; | 194 | goto out; |
191 | } | 195 | } |
192 | cmd->params.role_id = wlvif->role_id; | 196 | if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) |
197 | cmd->params.role_id = wlvif->role_id; | ||
198 | else | ||
199 | cmd->params.role_id = wlvif->dev_role_id; | ||
200 | |||
193 | cmd->params.scan_options = cpu_to_le16(scan_options); | 201 | cmd->params.scan_options = cpu_to_le16(scan_options); |
194 | 202 | ||
195 | cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req, | 203 | 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, | |||
218 | memcpy(cmd->addr, vif->addr, ETH_ALEN); | 226 | memcpy(cmd->addr, vif->addr, ETH_ALEN); |
219 | 227 | ||
220 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, | 228 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, |
221 | wlvif->role_id, band, | 229 | cmd->params.role_id, band, |
222 | wl->scan.ssid, wl->scan.ssid_len, | 230 | wl->scan.ssid, wl->scan.ssid_len, |
223 | wl->scan.req->ie, | 231 | wl->scan.req->ie, |
224 | wl->scan.req->ie_len); | 232 | wl->scan.req->ie_len); |
@@ -662,7 +670,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, | |||
662 | if (!force_passive && cfg->active[0]) { | 670 | if (!force_passive && cfg->active[0]) { |
663 | u8 band = IEEE80211_BAND_2GHZ; | 671 | u8 band = IEEE80211_BAND_2GHZ; |
664 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, | 672 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, |
665 | wlvif->role_id, band, | 673 | wlvif->dev_role_id, band, |
666 | req->ssids[0].ssid, | 674 | req->ssids[0].ssid, |
667 | req->ssids[0].ssid_len, | 675 | req->ssids[0].ssid_len, |
668 | ies->ie[band], | 676 | ies->ie[band], |
@@ -676,7 +684,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, | |||
676 | if (!force_passive && cfg->active[1]) { | 684 | if (!force_passive && cfg->active[1]) { |
677 | u8 band = IEEE80211_BAND_5GHZ; | 685 | u8 band = IEEE80211_BAND_5GHZ; |
678 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, | 686 | ret = wl12xx_cmd_build_probe_req(wl, wlvif, |
679 | wlvif->role_id, band, | 687 | wlvif->dev_role_id, band, |
680 | req->ssids[0].ssid, | 688 | req->ssids[0].ssid, |
681 | req->ssids[0].ssid_len, | 689 | req->ssids[0].ssid_len, |
682 | ies->ie[band], | 690 | ies->ie[band], |