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

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

Merge "msm: ipa: Add error check while adding routing rule"

parents 67190a9f db005fbb

drivers/platform/msm/ipa/ipa_rt.c

+14 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ int __ipa_generate_rt_hw_rule_v2(enum ipa_ip_type ip, 
		WARN_ON(1);

		return -EPERM;

	}

	if (!IPA_CLIENT_IS_CONS(entry->rule.dst)) {

		IPAERR("No RT rule on IPA_client_producer pipe.\n");

		IPAERR("pipe_idx: %d dst_pipe: %d\n",

				pipe_idx, entry->rule.dst);

		WARN_ON(1);

		return -EPERM;

	}

	rule_hdr->u.hdr.pipe_dest_idx = pipe_idx;

	rule_hdr->u.hdr.system = !ipa_ctx->hdr_tbl_lcl;

	if (entry->hdr) {
@@ -140,6 +147,13 @@ int __ipa_generate_rt_hw_rule_v2_5(enum ipa_ip_type ip, 
		WARN_ON(1);

		return -EPERM;

	}

	if (!IPA_CLIENT_IS_CONS(entry->rule.dst)) {

		IPAERR("No RT rule on IPA_client_producer pipe.\n");

		IPAERR("pipe_idx: %d dst_pipe: %d\n",

				pipe_idx, entry->rule.dst);

		WARN_ON(1);

		return -EPERM;

	}

	rule_hdr->u.hdr_v2_5.pipe_dest_idx = pipe_idx;

	if (entry->proc_ctx || (entry->hdr && entry->hdr->is_hdr_proc_ctx)) {

		struct ipa_hdr_proc_ctx_entry *proc_ctx;