redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: wfx: implement cancel_hw_scan()

Browse source 
The device provides an API to abort a scan request. Expose this feature
to mac80211.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191217161318.31402-55-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2019-12-17 16:15:41 +00:00 committed by Greg Kroah-Hartman
parent 3dc67854df
commit 4337074be7
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/wfx/main.c
View file

@ -135,6 +135,7 @@ static const struct ieee80211_ops wfx_ops = {
.tx = wfx_tx,
.conf_tx = wfx_conf_tx,
.hw_scan = wfx_hw_scan,
.cancel_hw_scan = wfx_cancel_hw_scan,
.sta_add = wfx_sta_add,
.sta_remove = wfx_sta_remove,
.sta_notify = wfx_sta_notify,

13
drivers/staging/wfx/scan.c
View file

@ -54,6 +54,7 @@ static int send_scan_req(struct wfx_vif *wvif,
break;
}
wfx_tx_lock_flush(wvif->wdev);
wvif->scan_abort = false;
reinit_completion(&wvif->scan_complete);
ret = hif_scan(wvif, req, start_idx, i - start_idx);
if (ret < 0)
@ -68,6 +69,10 @@ static int send_scan_req(struct wfx_vif *wvif,
hif_stop_scan(wvif);
return -ETIMEDOUT;
}
if (wvif->scan_abort) {
dev_notice(wvif->wdev->dev, "scan abort\n");
return -ECONNABORTED;
}
return i - start_idx;
}
@ -115,6 +120,14 @@ int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
return 0;
}
void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{
struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv;
wvif->scan_abort = true;
hif_stop_scan(wvif);
}
void wfx_scan_complete(struct wfx_vif *wvif,
const struct hif_ind_scan_cmpl *arg)
{

1
drivers/staging/wfx/scan.h
View file

@ -18,6 +18,7 @@ struct wfx_vif;
void wfx_hw_scan_work(struct work_struct *work);
int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_scan_request *req);
void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
void wfx_scan_complete(struct wfx_vif *wvif,
const struct hif_ind_scan_cmpl *ind);

1
drivers/staging/wfx/wfx.h
View file

@ -127,6 +127,7 @@ struct wfx_vif {
struct mutex scan_lock;
struct work_struct scan_work;
struct completion scan_complete;
bool scan_abort;
struct ieee80211_scan_request *scan_req;
struct completion set_pm_mode_complete;