diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-06-27 12:06:44 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-07-05 20:50:39 +0200 |
| commit | 2aa01597eb29304fe7d863f15300c7b960b587ca (patch) | |
| tree | f750c252e21d9c71a547b6baf26b14cf23b6d1fe /drivers | |
| parent | wl12xx: configure suspend/resume only if associated/started (diff) | |
| download | linux-2aa01597eb29304fe7d863f15300c7b960b587ca.tar.xz linux-2aa01597eb29304fe7d863f15300c7b960b587ca.zip | |
wl12xx: add stop_scan command
define wl1271_scan_stop() to cancel an ongoing hw scan.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.c | 27 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.h | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index 5e5c66dd06d5..edfe01c321ca 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/wl12xx/scan.c @@ -321,6 +321,33 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, return 0; } +int wl1271_scan_stop(struct wl1271 *wl) +{ + struct wl1271_cmd_header *cmd = NULL; + int ret = 0; + + if (WARN_ON(wl->scan.state == WL1271_SCAN_STATE_IDLE)) + return -EINVAL; + + wl1271_debug(DEBUG_CMD, "cmd scan stop"); + + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) { + ret = -ENOMEM; + goto out; + } + + ret = wl1271_cmd_send(wl, CMD_STOP_SCAN, cmd, + sizeof(*cmd), 0); + if (ret < 0) { + wl1271_error("cmd stop_scan failed"); + goto out; + } +out: + kfree(cmd); + return ret; +} + static int wl1271_scan_get_sched_scan_channels(struct wl1271 *wl, struct cfg80211_sched_scan_request *req, diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h index ca81de20ebef..d882e4da71b7 100644 --- a/drivers/net/wireless/wl12xx/scan.h +++ b/drivers/net/wireless/wl12xx/scan.h @@ -28,6 +28,7 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, struct cfg80211_scan_request *req); +int wl1271_scan_stop(struct wl1271 *wl); int wl1271_scan_build_probe_req(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, const u8 *ie, size_t ie_len, u8 band); |