From dc89e47503cb9ebfe3d63c67b9727e8d49216b7c Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Thu, 28 Jun 2018 18:47:40 -0700 Subject: [PATCH] qcacmn: Fix vendor abort scan failure Vendor abort scan request is cancelling all the pdev scans instead of a specific scan command. Modified vendor abort scan API to cancel specific scan request. Change-Id: I087637e44b8ee7f6cc12e9e47db04eec3f9ff93e CRs-Fixed: 2270030 --- os_if/linux/scan/src/wlan_cfg80211_scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 9ce0d0ceb8..0fb64761fe 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -1532,7 +1532,7 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev, req->cancel_req.vdev_id = vdev_id; if (scan_id != INVAL_SCAN_ID) req->cancel_req.req_type = WLAN_SCAN_CANCEL_SINGLE; - if (vdev_id == INVAL_VDEV_ID) + else if (vdev_id == INVAL_VDEV_ID) req->cancel_req.req_type = WLAN_SCAN_CANCEL_PDEV_ALL; else req->cancel_req.req_type = WLAN_SCAN_CANCEL_VDEV_ALL; @@ -1587,7 +1587,7 @@ int wlan_vendor_abort_scan(struct wlan_objmgr_pdev *pdev, return ret; if (ucfg_scan_get_pdev_status(pdev) != SCAN_NOT_IN_PROGRESS) - wlan_abort_scan(pdev, pdev_id, + wlan_abort_scan(pdev, INVAL_PDEV_ID, INVAL_VDEV_ID, scan_id, true); } return 0;