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

Commit 1ef83a2e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: enable hdr_metadata_reg_valid for usb"

parents e80165fc edc0c32c

drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c

+4 −0
Original line number Diff line number Diff line
@@ -1442,6 +1442,10 @@ static int ecm_ipa_ep_registers_cfg(u32 usb_to_ipa_hdl, u32 ipa_to_usb_hdl, 
	usb_to_ipa_ep_cfg.route.rt_tbl_hdl = 0;

	usb_to_ipa_ep_cfg.mode.dst = IPA_CLIENT_A5_LAN_WAN_CONS;

	usb_to_ipa_ep_cfg.mode.mode = IPA_BASIC;



	/* enable hdr_metadata_reg_valid */

	usb_to_ipa_ep_cfg.hdr.hdr_metadata_reg_valid = true;



	result = ipa_cfg_ep(usb_to_ipa_hdl, &usb_to_ipa_ep_cfg);

	if (result) {

		ECM_IPA_ERROR("failed to configure USB to IPA point\n");

drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c

+5 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static struct ipa_ep_cfg usb_to_ipa_ep_cfg_deaggr_dis = { 
			sizeof(struct rndis_pkt_hdr),

		.hdr_a5_mux = false,

		.hdr_remove_additional = false,

		.hdr_metadata_reg_valid = false,

		.hdr_metadata_reg_valid = true,

	},

	.hdr_ext = {

		.hdr_pad_to_alignment = 0,
@@ -406,7 +406,7 @@ static struct ipa_ep_cfg usb_to_ipa_ep_cfg_deaggr_en = { 
		.hdr_ofst_pkt_size = 3 * sizeof(u32),

		.hdr_a5_mux = false,

		.hdr_remove_additional = false,

		.hdr_metadata_reg_valid = false,

		.hdr_metadata_reg_valid = true,

	},

	.hdr_ext = {

		.hdr_pad_to_alignment = 0,
@@ -2166,6 +2166,9 @@ static int rndis_ipa_ep_registers_cfg( 
		ipa_to_usb_ep_cfg.aggr.aggr_time_limit,

		ipa_to_usb_ep_cfg.aggr.aggr_pkt_limit);



	/* enable hdr_metadata_reg_valid */

	usb_to_ipa_ep_cfg->hdr.hdr_metadata_reg_valid = true;



	result = ipa_cfg_ep(ipa_to_usb_hdl, &ipa_to_usb_ep_cfg);

	if (result) {

		pr_err("failed to configure IPA to USB end-point\n");