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

Commit 0f5eda64 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: Prevent deletion of the default route rule"

parents 062055c6 5fd0c959

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

+10 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -1145,6 +1145,15 @@ int __ipa_del_rt_rule(u32 rule_hdl) 
		return -EINVAL;

	}



	if (!strcmp(entry->tbl->name, IPA_DFLT_RT_TBL_NAME)) {

		IPADBG("Deleting rule from default rt table idx=%u\n",

			entry->tbl->idx);

		if (entry->tbl->rule_cnt == 1) {

			IPAERR_RL("Default tbl last rule cannot be deleted\n");

			return -EINVAL;

		}

	}



	if (entry->hdr)

		__ipa_release_hdr(entry->hdr->id);

	else if (entry->proc_ctx)

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

+10 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -1282,6 +1282,15 @@ int __ipa3_del_rt_rule(u32 rule_hdl) 
		return -EINVAL;

	}



	if (!strcmp(entry->tbl->name, IPA_DFLT_RT_TBL_NAME)) {

		IPADBG("Deleting rule from default rt table idx=%u\n",

			entry->tbl->idx);

		if (entry->tbl->rule_cnt == 1) {

			IPAERR_RL("Default tbl last rule cannot be deleted\n");

			return -EINVAL;

		}

	}



	if (entry->hdr)

		__ipa3_release_hdr(entry->hdr->id);

	else if (entry->proc_ctx)