Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5591544b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ic5a51c54,I1b26df32 into msm-next 

* changes:
  msm: ipa: Compilation errors fix when IPA config flags not enabled
  msm: ipa: Enable IPA compilation on SDM855
parents 0ab8dc8a 251e0b51

arch/arm64/configs/sdm855-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ CONFIG_ION=y 
CONFIG_QCOM_GENI_SE=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA3=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y

arch/arm64/configs/sdm855_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ CONFIG_ION=y 
CONFIG_QCOM_GENI_SE=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA3=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y

include/linux/ipa.h

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static inline int ipa_cfg_ep_nat(u32 clnt_hdl, 
static inline int ipa_cfg_ep_conn_track(u32 clnt_hdl,

	const struct ipa_ep_cfg_conn_track *ep_conn_track)

{

	return -EPERM

	return -EPERM;

}



static inline int ipa_cfg_ep_hdr(u32 clnt_hdl,

include/linux/ipa_uc_offload.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static inline int ipa_uc_offload_reg_rdyCB(struct ipa_uc_ready_params *param) 
	return -EPERM;

}



static void ipa_uc_offload_dereg_rdyCB(enum ipa_uc_offload_proto proto)

static inline void ipa_uc_offload_dereg_rdyCB(enum ipa_uc_offload_proto proto)

{

}