summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/scan.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-02-02 13:15:35 +0200
committerLuciano Coelho <coelho@ti.com>2012-02-15 08:38:34 +0200
commit79aba1baf251e22fbc97a42c711c4b683807ac43 (patch)
tree655c43a48da907d2f405e047eba2b75676cb07df /drivers/net/wireless/wl12xx/scan.c
parent76a74c8a65c6d2587e48355d3a122b4274f5abbf (diff)
downloadlinux-79aba1baf251e22fbc97a42c711c4b683807ac43.tar.bz2
wl12xx: declare support for hw scan while idle
By allowing hw scan while idle, we no longer need the redundant ROC/CROC that are done on idle off/on, which helps simplifying the state machine of the driver. This way, we can also allow scanning while there is an ongoing sched scan (otherwise, we won't be able to ROC on idle-off) Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/scan.c')
-rw-r--r--drivers/net/wireless/wl12xx/scan.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 6adc7333b7e6..848a165fa55c 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -38,7 +38,6 @@ void wl1271_scan_complete_work(struct work_struct *work)
struct ieee80211_vif *vif;
struct wl12xx_vif *wlvif;
int ret;
- bool is_sta, is_ibss;
dwork = container_of(work, struct delayed_work, work);
wl = container_of(dwork, struct wl1271, scan_complete_work);
@@ -70,18 +69,6 @@ void wl1271_scan_complete_work(struct work_struct *work)
wl1271_cmd_build_ap_probe_req(wl, wlvif, wlvif->probereq);
}
- /* return to ROC if needed */
- is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS);
- is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
- if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) ||
- (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
- !test_bit(wlvif->dev_role_id, wl->roc_map)) {
- /* restore remain on channel */
- 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);
if (wl->scan.failed) {