A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Use objmgr API to get 1st vdev from pdev

Browse source 
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
This commit is contained in:
Abhishek Singh 2018-11-14 11:59:36 +05:30 • committed by nshrivas
commit fda72d751c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
os_if/linux/scan/src/wlan_cfg80211_scan.c
View file

@ -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);

5
umac/scan/dispatcher/src/wlan_scan_ucfg_api.c
View file

@ -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;
}