From aae8efa3e0486cd30974063ecceece96d173ebd6 Mon Sep 17 00:00:00 2001 From: Harprit Chhabada Date: Mon, 17 Sep 2018 11:40:31 -0700 Subject: [PATCH] qcacld-3.0: Fix the incorrect data type for vdev_id vdev_id data type used in csr_scan_abort_mac_scan() is declared as uint8_t and is compared with INVALID_VDEV_ID, a 32 bit integer, which can never be true. Change-Id: Id5ca042bf24fa3a3f683abae95f5c424824e230f CRS-Fixed: 2315003 --- core/sme/src/csr/csr_api_scan.c | 2 +- core/sme/src/csr/csr_inside_api.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 846d60ce94d0..6739f2749fa8 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -1809,7 +1809,7 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } /* AllocateMemory */ } -QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal mac_ctx, uint8_t vdev_id, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal mac_ctx, uint32_t vdev_id, uint32_t scan_id) { struct scan_cancel_request *req; diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index d7fa9d748140..7d2dfe85fc18 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -249,7 +249,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, * * Return: 0 for success, non zero for failure */ -QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t vdev_id, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint32_t vdev_id, uint32_t scan_id); QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal pMac, uint8_t sessionId, eSmeCommandType commandType);