Commit 4337074b authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: implement cancel_hw_scan() 



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

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191217161318.31402-55-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3dc67854

drivers/staging/wfx/main.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/staging/wfx/scan.c

+13 −0
Original line number Diff line number Diff line
@@ -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)

{

drivers/staging/wfx/scan.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/staging/wfx/wfx.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE