Merge "msm: ipa: IMD command bugfixes" (940bd3bb) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1129,7 +1129,7 @@ int ipa_init_flt_rt_stats(void)
		desc[num_cmd].pyld = flt_v4_base_pyld->data;
		desc[num_cmd].len = flt_v4_base_pyld->len;
		desc[num_cmd].type = IPA_IMM_CMD_DESC;
		+num_cmd;
		++num_cmd;

		/* set IPA_STAT_FILTER_IPV6_BASE */
		flt_v6_base.skip_pipeline_clear = false;

+5 −2

Original line number	Diff line number	Diff line
		@@ -6623,7 +6623,7 @@ int ipa3_tag_process(struct ipa3_desc desc[],
		struct ipahal_imm_cmd_ip_packet_tag_status status;
		int i;
		struct sk_buff *dummy_skb;
		int res;
		int res = 0;
		struct ipa3_tag_completion *comp;
		int ep_idx;
		u32 retry_cnt = 0;
		@@ -6657,8 +6657,11 @@ int ipa3_tag_process(struct ipa3_desc desc[],
		memcpy(&(tag_desc[0]), desc, descs_num *
		sizeof(tag_desc[0]));
		desc_idx += descs_num;
		} else
		} else {
		res = -EFAULT;
		IPAERR("desc is NULL\n");
		goto fail_free_tag_desc;
		}

		/* IC to close the coal frame before HPS Clear if coal is enabled */
		if (ipa3_get_ep_mapping(IPA_CLIENT_APPS_WAN_COAL_CONS) != -1) {