evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wil6210: do not start regular scan on stopped p2p device

Browse source 
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: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle 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: Maya Erez <merez@codeaurora.org>
This commit is contained in:
Lior David 2017-03-27 21:10:35 +03:00 • committed by Gerrit - the friendly Code Review server
parent fec225ae45
commit 00fc56f5f0
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/wireless/ath/wil6210/cfg80211.c
View file

@ -475,22 +475,23 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
} }
mutex_unlock(&wil->p2p_wdev_mutex); mutex_unlock(&wil->p2p_wdev_mutex);
/* social scan on P2P_DEVICE is handled as p2p search */ if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE) {
if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE &&
wil_p2p_is_social_scan(request)) {
if (!wil->p2p.p2p_dev_started) { if (!wil->p2p.p2p_dev_started) {
wil_err(wil, "P2P search requested on stopped P2P device\n"); wil_err(wil, "P2P search requested on stopped P2P device\n");
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
wil->scan_request = request; /* social scan on P2P_DEVICE is handled as p2p search */
wil->radio_wdev = wdev; if (wil_p2p_is_social_scan(request)) {
rc = wil_p2p_search(wil, request); wil->scan_request = request;
if (rc) { wil->radio_wdev = wdev;
wil->radio_wdev = wil_to_wdev(wil); rc = wil_p2p_search(wil, request);
wil->scan_request = NULL; if (rc) {
wil->radio_wdev = wil_to_wdev(wil);
wil->scan_request = NULL;
}
goto out;
} }
goto out;
} }
(void)wil_p2p_stop_discovery(wil); (void)wil_p2p_stop_discovery(wil);