From e2ed521f0c9b53f5df3bf90f4009b252b1dded3c Mon Sep 17 00:00:00 2001 From: Yu Ouyang Date: Wed, 18 Dec 2019 16:46:39 +0800 Subject: [PATCH] qcacld-3.0: Fix DSRC compile error DSRC feature is enabled by SDIO card profile. But when debug SDIO interface feautre, there are many DSRC module compile issue. Change-Id: I4429f2a6e68b67140a72ad9634031f459ccda397 CRs-Fixed: 2590115 --- components/ocb/core/src/wlan_ocb_main.c | 2 +- components/ocb/dispatcher/inc/wlan_ocb_public_structs.h | 1 + components/ocb/dispatcher/src/wlan_ocb_ucfg_api.c | 3 ++- core/hdd/src/wlan_hdd_ocb.c | 3 +-- core/wma/src/wma_ocb.c | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/components/ocb/core/src/wlan_ocb_main.c b/components/ocb/core/src/wlan_ocb_main.c index 09664b008f82..bca6ff0adcb2 100644 --- a/components/ocb/core/src/wlan_ocb_main.c +++ b/components/ocb/core/src/wlan_ocb_main.c @@ -160,7 +160,7 @@ static QDF_STATUS ocb_channel_config_status(struct ocb_rx_event *evt) /* Sync channel status to data path */ if (config_rsp.status == OCB_CHANNEL_CONFIG_SUCCESS) ocb_set_chan_info(ocb_obj->dp_soc, - ocb_obj->dp_pdev, + ocb_obj->pdev, vdev_id, ocb_obj->channel_config); qdf_mem_free(ocb_obj->channel_config); diff --git a/components/ocb/dispatcher/inc/wlan_ocb_public_structs.h b/components/ocb/dispatcher/inc/wlan_ocb_public_structs.h index 87207f99ca26..9aa2e48cb1cf 100644 --- a/components/ocb/dispatcher/inc/wlan_ocb_public_structs.h +++ b/components/ocb/dispatcher/inc/wlan_ocb_public_structs.h @@ -23,6 +23,7 @@ #ifndef _WLAN_OCB_STRUCTS_H_ #define _WLAN_OCB_STRUCTS_H_ #include +#include "qca_vendor.h" /* Don't add the RX stats header to packets received on this channel */ #define OCB_CHANNEL_FLAG_DISABLE_RX_STATS_HDR (1 << 0) diff --git a/components/ocb/dispatcher/src/wlan_ocb_ucfg_api.c b/components/ocb/dispatcher/src/wlan_ocb_ucfg_api.c index d16af6c855ae..4595342544bf 100644 --- a/components/ocb/dispatcher/src/wlan_ocb_ucfg_api.c +++ b/components/ocb/dispatcher/src/wlan_ocb_ucfg_api.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -279,7 +280,7 @@ QDF_STATUS ucfg_ocb_set_channel_config(struct wlan_objmgr_vdev *vdev, ocb_cbs->ocb_set_config_context = arg; state = wlan_vdev_mlme_get_state(vdev); - if (state != WLAN_VDEV_S_RUN) { + if (state != WLAN_VDEV_S_START) { /* Vdev is not started, start it */ ocb_debug("OCB vdev%d is not up", config->vdev_id); status = ocb_vdev_start(ocb_obj); diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 872b215c0f78..134c668650ae 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -216,7 +216,6 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter) { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type sta_desc = {0}; - struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct ol_txrx_ops txrx_ops; void *soc = cds_get_context(QDF_MODULE_ID_SOC); @@ -1941,7 +1940,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_DCC_UPDATE_NDL_ACTIVE_STATE_ARRAY]); /* Check channel count. Per 11p spec, max 2 channels allowed */ - if (!channel_count || channel_count > TGT_NUM_OCB_CHANNELS) { + if (!channel_count || channel_count > CFG_TGT_NUM_OCB_CHANNELS) { hdd_err("Invalid channel_count %d", channel_count); return -EINVAL; } diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index eca985bc4e13..6770c40cf61a 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -26,6 +26,8 @@ #include "cds_utils.h" #include "cds_api.h" #include "wlan_ocb_ucfg_api.h" +#include "lim_utils.h" +#include "../../core/src/vdev_mgr_ops.h" /** * wma_start_ocb_vdev() - start OCB vdev