qcacld-3.0: Fix pdev id mis-aligned on DBS platform

Fix pdev id mis-aligned on DBS platform for CCA APIs.

Change-Id: If671334e9eedb6c6a4ce9e25e2d3e51e5735e683
CRs-Fixed: 2840340
This commit is contained in:
Min Liu
2020-12-17 15:36:26 +08:00
committed by snandini
parent 85271ec80c
commit 651b0016af

View File

@@ -175,16 +175,24 @@ static int hdd_medium_assess_cca(struct hdd_context *hdd_ctx,
{
struct wlan_objmgr_vdev *vdev;
uint32_t cca_period = DEFAULT_CCA_PERIOD;
uint8_t pdev_id, dcs_enable;
uint8_t mac_id, dcs_enable;
QDF_STATUS status;
int errno = 0;
vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_DCS_ID);
if (!vdev)
return -EINVAL;
pdev_id = wlan_objmgr_pdev_get_pdev_id(wlan_vdev_get_pdev(vdev));
status = policy_mgr_get_mac_id_by_session_id(hdd_ctx->psoc,
adapter->vdev_id,
&mac_id);
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err_rl("Failed to get mac_id");
errno = -EINVAL;
goto out;
}
dcs_enable = ucfg_get_dcs_enable(hdd_ctx->psoc, pdev_id);
dcs_enable = ucfg_get_dcs_enable(hdd_ctx->psoc, mac_id);
if (!(dcs_enable & CAP_DCS_WLANIM)) {
hdd_err_rl("DCS_WLANIM is not enabled");
errno = -EINVAL;
@@ -202,13 +210,13 @@ static int hdd_medium_assess_cca(struct hdd_context *hdd_ctx,
if (cca_period == 0)
cca_period = DEFAULT_CCA_PERIOD;
ucfg_dcs_reset_user_stats(hdd_ctx->psoc, pdev_id);
ucfg_dcs_register_user_cb(hdd_ctx->psoc, pdev_id, adapter->vdev_id,
ucfg_dcs_reset_user_stats(hdd_ctx->psoc, mac_id);
ucfg_dcs_register_user_cb(hdd_ctx->psoc, mac_id, adapter->vdev_id,
hdd_cca_notification_cb);
/* dcs is already enabled and dcs event is reported every second
* set the user request counter to collect user stats
*/
ucfg_dcs_set_user_request(hdd_ctx->psoc, pdev_id, cca_period);
ucfg_dcs_set_user_request(hdd_ctx->psoc, mac_id, cca_period);
out:
hdd_objmgr_put_vdev_by_user(vdev, WLAN_DCS_ID);