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

Commit 1aaa3245 authored by Lior David's avatar Lior David Committed by Maya Erez
Browse files

wil6210: do not start regular scan on stopped p2p device 



The driver should not allow starting any type of scan on a stopped
P2P device. Current implementation only checked social scan.

Change-Id: I67d92b0bdb4549681e3d08a256b1798fdaeb0939
Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 4a0e45a78328957b012f554fb2ffcd5c69fe418a
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git


Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
parent ed98af78

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

+11 −10
Original line number Diff line number Diff line
@@ -474,14 +474,14 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, 
	}

	mutex_unlock(&wil->p2p_wdev_mutex);



	/* social scan on P2P_DEVICE is handled as p2p search */

	if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE &&

	    wil_p2p_is_social_scan(request)) {

	if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE) {

		if (!wil->p2p.p2p_dev_started) {

			wil_err(wil, "P2P search requested on stopped P2P device\n");

			rc = -EIO;

			goto out;

		}

		/* social scan on P2P_DEVICE is handled as p2p search */

		if (wil_p2p_is_social_scan(request)) {

			wil->scan_request = request;

			wil->radio_wdev = wdev;

			rc = wil_p2p_search(wil, request);
@@ -491,6 +491,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, 
			}

			goto out;

		}

	}



	(void)wil_p2p_stop_discovery(wil);