From fda72d751c78c4e19c92a3d4d9caf95069bdf457 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Wed, 14 Nov 2018 11:59:36 +0530 Subject: [PATCH] qcacmn: Use objmgr API to get 1st vdev from pdev If Vdev id is not present driver tries to get vdev with vdev id 0 from pdev. Vdev with vdev_id 0 might not be present on pdev so use objmgr API wlan_objmgr_pdev_get_first_vdev to get the first vdev. Change-Id: I2ae0d6056709339a8167582ec327269aa84c93f4 CRs-Fixed: 2349699 --- os_if/linux/scan/src/wlan_cfg80211_scan.c | 3 +-- umac/scan/dispatcher/src/wlan_scan_ucfg_api.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index b40e08593515..86d8f18c229e 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -1482,8 +1482,7 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev, return QDF_STATUS_E_FAILURE; } if (vdev_id == INVAL_VDEV_ID) - vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, - 0, WLAN_OSIF_ID); + vdev = wlan_objmgr_pdev_get_first_vdev(pdev, WLAN_OSIF_ID); else vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id, WLAN_OSIF_ID); diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index 13d138912eee..a6bc922735c1 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -2030,9 +2030,10 @@ ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev) return QDF_STATUS_E_NOMEM; } - vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, 0, WLAN_OSIF_ID); + vdev = wlan_objmgr_pdev_get_first_vdev(pdev, WLAN_SCAN_ID); if (!vdev) { scm_err("Failed to get vdev"); + qdf_mem_free(req); return QDF_STATUS_E_INVAL; } req->vdev = vdev; @@ -2043,7 +2044,7 @@ ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev) status = ucfg_scan_cancel_sync(req); if (QDF_IS_STATUS_ERROR(status)) scm_err("Cancel scan request failed"); - wlan_objmgr_vdev_release_ref(vdev, WLAN_OSIF_ID); + wlan_objmgr_vdev_release_ref(vdev, WLAN_SCAN_ID); return status; }