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

qcacld-3.0: Use spectral scan dbg id for spectral operations

Browse Source 
Change HDD layer to use WLAN_OSIF_SPECTRAL_ID reference count
dbg id for vdev reference count acquire/release when process
spectral scan request.

Change-Id: I432821275cb4a88cecc049403145868239899c15
CRs-Fixed: 2820488
This commit is contained in:
Liangwei Dong
2020-11-17 16:03:24 +08:00
committed by snandini
parent 62998977da
commit 94f2a06fdd
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/hdd/src/wlan_hdd_spectralscan.c
View File

@@ -77,7 +77,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
@@ -86,7 +86,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
ret = wlan_cfg80211_spectral_scan_config_and_start( ret = wlan_cfg80211_spectral_scan_config_and_start(
wiphy, hdd_ctx->pdev, wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -130,14 +130,14 @@ static int __wlan_hdd_cfg80211_spectral_scan_stop(struct wiphy *wiphy,
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
} }
ret = wlan_cfg80211_spectral_scan_stop(wiphy, hdd_ctx->pdev, ret = wlan_cfg80211_spectral_scan_stop(wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -182,14 +182,14 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_config(
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
} }
ret = wlan_cfg80211_spectral_scan_get_config(wiphy, hdd_ctx->pdev, ret = wlan_cfg80211_spectral_scan_get_config(wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -234,7 +234,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_diag_stats(
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
@@ -242,7 +242,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_diag_stats(
ret = wlan_cfg80211_spectral_scan_get_diag_stats( ret = wlan_cfg80211_spectral_scan_get_diag_stats(
wiphy, hdd_ctx->pdev, wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -287,14 +287,14 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_cap_info(
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
} }
ret = wlan_cfg80211_spectral_scan_get_cap(wiphy, hdd_ctx->pdev, ret = wlan_cfg80211_spectral_scan_get_cap(wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -340,14 +340,14 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_status(
if (ret) if (ret)
return ret; return ret;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) { if (!vdev) {
hdd_err("can't get vdev"); hdd_err("can't get vdev");
return -EINVAL; return -EINVAL;
} }
ret = wlan_cfg80211_spectral_scan_get_status(wiphy, hdd_ctx->pdev, ret = wlan_cfg80211_spectral_scan_get_status(wiphy, hdd_ctx->pdev,
vdev, data, data_len); vdev, data, data_len);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
hdd_exit(); hdd_exit();
return ret; return ret;
@@ -624,11 +624,11 @@ QDF_STATUS wlan_spectral_update_rx_chainmask(struct hdd_adapter *adapter)
pdev_id = wlan_objmgr_pdev_get_pdev_id(adapter->hdd_ctx->pdev); pdev_id = wlan_objmgr_pdev_get_pdev_id(adapter->hdd_ctx->pdev);
wma_get_rx_chainmask(pdev_id, &chainmask_2g, &chainmask_5g); wma_get_rx_chainmask(pdev_id, &chainmask_2g, &chainmask_5g);
chainmask = home_chan > MAX_24GHZ_CHANNEL ? chainmask_5g : chainmask_2g; chainmask = home_chan > MAX_24GHZ_CHANNEL ? chainmask_5g : chainmask_2g;
vdev = hdd_objmgr_get_vdev(adapter); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_SPECTRAL_ID);
if (!vdev) if (!vdev)
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
wlan_vdev_mlme_set_rxchainmask(vdev, chainmask); wlan_vdev_mlme_set_rxchainmask(vdev, chainmask);
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_SPECTRAL_ID);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }