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

Commit 6affad71 authored Mar 18, 2019 by qctecmdr Service Committed by Gerrit - the friendly Code Review server Mar 18, 2019

Merge "msm: ipa: Move NAT invalid protocol define to uapi"

parents d315395a 56023da4

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/debugfs.h>		#include <linux/debugfs.h>
	@@ -10,7 +10,6 @@

	#define IPA_64_LOW_32_MASK (0xFFFFFFFF)		#define IPA_64_LOW_32_MASK (0xFFFFFFFF)
	#define IPA_64_HIGH_32_MASK (0xFFFFFFFF00000000ULL)		#define IPA_64_HIGH_32_MASK (0xFFFFFFFF00000000ULL)
	#define IPAHAL_NAT_INVALID_PROTOCOL (0xFF)

	static const char *ipahal_nat_type_to_str[IPA_NAT_MAX] = {		static const char *ipahal_nat_type_to_str[IPA_NAT_MAX] = {
	__stringify(IPAHAL_NAT_IPV4),		__stringify(IPAHAL_NAT_IPV4),

include/uapi/linux/msm_ipa.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,11 @@
	*/		*/
	#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"		#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"

			/**
			* name for default value of invalid protocol of NAT
			*/
			#define IPAHAL_NAT_INVALID_PROTOCOL 0xFF

	/**		/**
	* commands supported by IPA driver		* commands supported by IPA driver
	*/		*/