Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb93821a authored by Kalle Valo's avatar Kalle Valo
Browse files

ath6kl: don't use cfg80211_scan_request after cfg80211_scan_done() 



Use of cfg80211_scan_request is not valid after calling cfg80211_scan_done()
but ath6kl_cfg80211_scan_complete_event() was doing exactly that. Change
the function to call cfg80211_scan_done() last.

This was found during code review, I didn't see any visible problems
due to this bug.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3101edef

drivers/net/wireless/ath/ath6kl/cfg80211.c

+4 −2
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status)

{

	struct ath6kl *ar = vif->ar;

	bool aborted;

	int i;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status %d\n", __func__, status);
@@ -882,11 +883,11 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status) 
		return;



	if ((status == -ECANCELED) || (status == -EBUSY)) {

		cfg80211_scan_done(vif->scan_req, true);

		aborted = true;

		goto out;

	}



	cfg80211_scan_done(vif->scan_req, false);

	aborted = false;



	if (vif->scan_req->n_ssids && vif->scan_req->ssids[0].ssid_len) {

		for (i = 0; i < vif->scan_req->n_ssids; i++) {
@@ -897,6 +898,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status) 
	}



out:

	cfg80211_scan_done(vif->scan_req, aborted);

	vif->scan_req = NULL;

}