samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: support dequeue and start failed event for scan from STA

Browse Source 
It doesn't process scan dequeue and start failed event, which cause
STA scan doesn't complete and blocking next scan work in
wpa_supplicant. For scan dequeue and start failed event with match
reason, indicate scan aborted to up layer.

Change-Id: I8861e277143116878f6714e50b600d77df69eeb1
CRs-Fixed: 2029955
This commit is contained in:
Wu Gao
2017-04-05 20:37:38 +08:00
committed by Gerrit - the friendly Code Review server
parent 8a4e27cd59
commit 5126329e8c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
os_if/linux/scan/src/wlan_cfg80211_scan.c
View File

@@ -641,7 +641,9 @@ static void wlan_cfg80211_scan_done_callback(
struct wlan_objmgr_pdev *pdev;
QDF_STATUS status;
if (event->type != SCAN_EVENT_TYPE_COMPLETED)
if ((event->type != SCAN_EVENT_TYPE_COMPLETED) &&
(event->type != SCAN_EVENT_TYPE_DEQUEUED) &&
(event->type != SCAN_EVENT_TYPE_START_FAILED))
return;
cfg80211_info("scan ID = %d vdev id = %d, event type %s(%d) reason = %s(%d)",
@@ -656,13 +658,19 @@ static void wlan_cfg80211_scan_done_callback(
* of scanning
*/
if ((event->type == SCAN_EVENT_TYPE_COMPLETED) &&
((event->reason == SCAN_REASON_CANCELLED) ||
(event->reason == SCAN_REASON_TIMEDOUT) ||
(event->reason == SCAN_REASON_INTERNAL_FAILURE))) {
((event->reason == SCAN_REASON_CANCELLED) ||
(event->reason == SCAN_REASON_TIMEDOUT) ||
(event->reason == SCAN_REASON_INTERNAL_FAILURE))) {
aborted = true;
} else if ((event->type == SCAN_EVENT_TYPE_COMPLETED) &&
(event->reason == SCAN_REASON_COMPLETED))
(event->reason == SCAN_REASON_COMPLETED))
aborted = false;
else if ((event->type == SCAN_EVENT_TYPE_DEQUEUED) &&
(event->reason == SCAN_REASON_CANCELLED))
aborted = true;
else if ((event->type == SCAN_EVENT_TYPE_START_FAILED) &&
(event->reason == SCAN_REASON_COMPLETED))
aborted = true;
else
/* cfg80211 is not interested on all other scan events */
return;