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

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

Merge "msm: ipa3: Fix compilation errors after enabling LLVM"

parents 049cbf79 c347cb0a

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

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ int ipa3_add_rt_rule_after(struct ipa_ioc_add_rt_rule_after *rules) 
	tbl = __ipa3_find_rt_tbl(rules->ip, rules->rt_tbl_name);

	if (tbl == NULL || (tbl->cookie != IPA_RT_TBL_COOKIE)) {

		IPAERR_RL("failed finding rt tbl name = %s\n",

			rules->rt_tbl_name ? rules->rt_tbl_name : "");

			(rules->rt_tbl_name != NULL) ? rules->rt_tbl_name : "");

		ret = -EINVAL;

		goto bail;

	}

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

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -728,7 +728,8 @@ static int ipa3_wwan_add_ul_flt_rule_to_ipa(void) 
		retval = -EFAULT;

	}



	req->install_status = QMI_RESULT_SUCCESS_V01;

	req->install_status = (enum ipa_qmi_result_type_v01)

							QMI_RESULT_SUCCESS_V01;

	req->rule_id_valid = 1;

	req->rule_id_len = rmnet_ipa3_ctx->num_q6_rules;

	for (i = 0; i < rmnet_ipa3_ctx->num_q6_rules; i++) {