diff --git a/qdf/inc/qdf_ipa_wdi3.h b/qdf/inc/qdf_ipa_wdi3.h index 024a7ec3e9..f87c0e5f4b 100644 --- a/qdf/inc/qdf_ipa_wdi3.h +++ b/qdf/inc/qdf_ipa_wdi3.h @@ -125,6 +125,8 @@ typedef __qdf_ipa_wdi_pipe_setup_info_smmu_t qdf_ipa_wdi_pipe_setup_info_smmu_t; __QDF_IPA_WDI_SETUP_INFO_SMMU_DESC_FORMAT_TEMPLATE(txrx) #define QDF_IPA_WDI_SETUP_INFO_SMMU_RX_BANK_ID(txrx, bid) \ __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_BANK_ID(txrx, bid) +#define QDF_IPA_WDI_SETUP_INFO_SMMU_RX_PMAC_ID(txrx, pmac_id) \ + __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_PMAC_ID(txrx, pmac_id) typedef __qdf_ipa_ep_cfg_t qdf_ipa_ep_cfg_t; @@ -271,6 +273,8 @@ typedef __qdf_ipa_wdi_pipe_setup_info_t qdf_ipa_wdi_pipe_setup_info_t; __QDF_IPA_WDI_SETUP_INFO_DESC_FORMAT_TEMPLATE(txrx) #define QDF_IPA_WDI_SETUP_INFO_RX_BANK_ID(txrx, bid) \ __QDF_IPA_WDI_SETUP_INFO_RX_BANK_ID(txrx, bid) +#define QDF_IPA_WDI_SETUP_INFO_RX_PMAC_ID(txrx, pmac_id) \ + __QDF_IPA_WDI_SETUP_INFO_RX_PMAC_ID(txrx, pmac_id) /** * qdf_ipa_wdi_conn_in_params_t - information provided by diff --git a/qdf/linux/src/i_qdf_ipa_wdi3.h b/qdf/linux/src/i_qdf_ipa_wdi3.h index e4598d2d44..1c52b3a118 100644 --- a/qdf/linux/src/i_qdf_ipa_wdi3.h +++ b/qdf/linux/src/i_qdf_ipa_wdi3.h @@ -297,9 +297,28 @@ typedef struct ipa_wdi_pipe_setup_info_smmu __qdf_ipa_wdi_pipe_setup_info_smmu_t #define __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_BANK_ID(txrx, bid) \ ((((struct ipa_wdi_pipe_setup_info_smmu *)(txrx))->rx_bank_id) = (bid)) + +/* + * rx_pmac_id was added to struct ipa_wdi_pipe_setup_info with + * Change-Id Ic9ee13be05b11004982e9a38cb503b3c4d0f81f3. This change + * also modified macro IPA_WDI_INST_MAX from 2 to 3, so we can use + * this to know if the change is present or not. + */ +#if defined(IPA_WDI_INST_MAX) && (IPA_WDI_INST_MAX >= 3) +#define __QDF_IPA_WDI_SETUP_INFO_RX_PMAC_ID(txrx, pmac_id) \ + ((((struct ipa_wdi_pipe_setup_info *)(txrx))->rx_pmac_id) = (pmac_id)) + +#define __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_PMAC_ID(txrx, pmac_id) \ + ((((struct ipa_wdi_pipe_setup_info_smmu *)(txrx))->rx_pmac_id) = (pmac_id)) +#else +#define __QDF_IPA_WDI_SETUP_INFO_RX_PMAC_ID(txrx, pmac_id) +#define __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_PMAC_ID(txrx, pmac_id) +#endif #else #define __QDF_IPA_WDI_SETUP_INFO_RX_BANK_ID(txrx, bid) #define __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_BANK_ID(txrx, bid) +#define __QDF_IPA_WDI_SETUP_INFO_RX_PMAC_ID(txrx, pmac_id) +#define __QDF_IPA_WDI_SETUP_INFO_SMMU_RX_PMAC_ID(txrx, pmac_id) #endif /**