diff options
| author | Kanchanapally, Vidyullatha <vkanchan@qti.qualcomm.com> | 2015-10-19 19:30:34 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-09 06:22:17 -0800 |
| commit | 1af6f718b5a2ff6cd72663c955b1057a4f53db83 (patch) | |
| tree | 9ef980ff8038f4ef2865121b3b22212a28e8afb9 | |
| parent | 33f1d41fbd3b905ddba6c79ad5fce593ba54f8eb (diff) | |
| download | android_external_wpa_supplicant_8-1af6f718b5a2ff6cd72663c955b1057a4f53db83.tar.gz android_external_wpa_supplicant_8-1af6f718b5a2ff6cd72663c955b1057a4f53db83.tar.bz2 android_external_wpa_supplicant_8-1af6f718b5a2ff6cd72663c955b1057a4f53db83.zip | |
nl80211: Add support for aborting an ongoing scan
This adds the driver interface commands for issuing a request to abort
an ongoing scan operation.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 4f30addb3866a8bb9393c1cfd42e012150c36a8e
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: Ic032fa52bdd801514b3b74b12b903c3bdf8fc663
CRs-fixed: 930855
| -rw-r--r-- | src/drivers/driver.h | 7 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.c | 1 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.h | 1 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211_scan.c | 20 | ||||
| -rw-r--r-- | wpa_supplicant/driver_i.h | 7 |
5 files changed, 36 insertions, 0 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 7fe736bb..f9847839 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -3394,6 +3394,13 @@ struct wpa_driver_ops { * Returns 0 on success, -1 on failure */ int (*set_band)(void *priv, enum set_band band); + + /** + * abort_scan - Request the driver to abort an ongoing scan + * @priv: Private driver interface data + * Returns 0 on success, -1 on failure + */ + int (*abort_scan)(void *priv); }; diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 6cd36c04..55028868 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -8531,6 +8531,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = { .sched_scan = wpa_driver_nl80211_sched_scan, .stop_sched_scan = wpa_driver_nl80211_stop_sched_scan, .get_scan_results2 = wpa_driver_nl80211_get_scan_results, + .abort_scan = wpa_driver_nl80211_abort_scan, .deauthenticate = driver_nl80211_deauthenticate, .authenticate = driver_nl80211_authenticate, .associate = wpa_driver_nl80211_associate, diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h index ffb5fa7e..5e88a82d 100644 --- a/src/drivers/driver_nl80211.h +++ b/src/drivers/driver_nl80211.h @@ -273,6 +273,7 @@ int wpa_driver_nl80211_sched_scan(void *priv, int wpa_driver_nl80211_stop_sched_scan(void *priv); struct wpa_scan_results * wpa_driver_nl80211_get_scan_results(void *priv); void nl80211_dump_scan(struct wpa_driver_nl80211_data *drv); +int wpa_driver_nl80211_abort_scan(void *priv); const u8 * nl80211_get_ie(const u8 *ies, size_t ies_len, u8 ie); #endif /* DRIVER_NL80211_H */ diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c index f3d45e58..1c79f763 100644 --- a/src/drivers/driver_nl80211_scan.c +++ b/src/drivers/driver_nl80211_scan.c @@ -778,3 +778,23 @@ void nl80211_dump_scan(struct wpa_driver_nl80211_data *drv) wpa_scan_results_free(res); } + + +int wpa_driver_nl80211_abort_scan(void *priv) +{ + struct i802_bss *bss = priv; + struct wpa_driver_nl80211_data *drv = bss->drv; + int ret; + struct nl_msg *msg; + + wpa_printf(MSG_DEBUG, "nl80211: Abort scan"); + msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_ABORT_SCAN); + ret = send_and_recv_msgs(drv, msg, NULL, NULL); + if (ret) { + wpa_printf(MSG_DEBUG, "nl80211: Abort scan failed: ret=%d (%s)", + ret, strerror(-ret)); + } + + return ret; +} + diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h index d1f9f8be..d7a2676e 100644 --- a/wpa_supplicant/driver_i.h +++ b/wpa_supplicant/driver_i.h @@ -893,4 +893,11 @@ static inline int wpa_drv_setband(struct wpa_supplicant *wpa_s, return wpa_s->driver->set_band(wpa_s->drv_priv, band); } +static inline int wpa_drv_abort_scan(struct wpa_supplicant *wpa_s) +{ + if (!wpa_s->driver->abort_scan) + return -1; + return wpa_s->driver->abort_scan(wpa_s->drv_priv); +} + #endif /* DRIVER_I_H */ |