Merge "msm: ipa3: fix compatibility with ipa kernel tests" (672d26f1) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/ipa.h

+24 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,14 @@ enum ipa_nat_en_type {
	IPA_DST_NAT,		IPA_DST_NAT,
	};		};

			/**
			* enum ipa_ipv6ct_en_type - IPv6CT setting type in IPA end-point
			*/
			enum ipa_ipv6ct_en_type {
			IPA_BYPASS_IPV6CT,
			IPA_ENABLE_IPV6CT,
			};

	/**		/**
	* enum ipa_mode_type - mode setting type in IPA end-point		* enum ipa_mode_type - mode setting type in IPA end-point
	* @BASIC: basic mode		* @BASIC: basic mode
	@@ -116,6 +124,19 @@ struct ipa_ep_cfg_nat {
	enum ipa_nat_en_type nat_en;		enum ipa_nat_en_type nat_en;
	};		};

			/**
			* struct ipa_ep_cfg_conn_track - IPv6 Connection tracking configuration in
			* IPA end-point
			* @conn_track_en: Defines speculative conn_track action, means if specific
			* pipe needs to have UL/DL IPv6 Connection Tracking or Bypass
			* IPv6 Connection Tracking. 0: Bypass IPv6 Connection Tracking
			* 1: IPv6 UL/DL Connection Tracking.
			* Valid for Input Pipes only (IPA consumer)
			*/
			struct ipa_ep_cfg_conn_track {
			enum ipa_ipv6ct_en_type conn_track_en;
			};

	/**		/**
	* struct ipa_ep_cfg_hdr - header configuration in IPA end-point		* struct ipa_ep_cfg_hdr - header configuration in IPA end-point
	*		*
	@@ -384,7 +405,8 @@ struct ipa_ep_cfg_seq {

	/**		/**
	* struct ipa_ep_cfg - configuration of IPA end-point		* struct ipa_ep_cfg - configuration of IPA end-point
	* @nat: NAT parmeters		* @nat: NAT parameters
			* @conn_track: IPv6CT parameters
	* @hdr: Header parameters		* @hdr: Header parameters
	* @hdr_ext: Extended header parameters		* @hdr_ext: Extended header parameters
	* @mode: Mode parameters		* @mode: Mode parameters
	@@ -398,6 +420,7 @@ struct ipa_ep_cfg_seq {
	*/		*/
	struct ipa_ep_cfg {		struct ipa_ep_cfg {
	struct ipa_ep_cfg_nat nat;		struct ipa_ep_cfg_nat nat;
			struct ipa_ep_cfg_conn_track conn_track;
	struct ipa_ep_cfg_hdr hdr;		struct ipa_ep_cfg_hdr hdr;
	struct ipa_ep_cfg_hdr_ext hdr_ext;		struct ipa_ep_cfg_hdr_ext hdr_ext;
	struct ipa_ep_cfg_mode mode;		struct ipa_ep_cfg_mode mode;