Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (adf76cfe) · Commits · e / devices / android_kernel_oneplus_sm8150

include/linux/netfilter/Kbuild

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ header-y += xt_limit.h
	header-y += xt_mac.h		header-y += xt_mac.h
	header-y += xt_mark.h		header-y += xt_mark.h
	header-y += xt_multiport.h		header-y += xt_multiport.h
			header-y += xt_osf.h
	header-y += xt_owner.h		header-y += xt_owner.h
	header-y += xt_pkttype.h		header-y += xt_pkttype.h
	header-y += xt_quota.h		header-y += xt_quota.h

include/linux/netfilter/nf_conntrack_common.h

+0 −69

Original line number	Original line	Diff line number	Diff line
	@@ -75,75 +75,6 @@ enum ip_conntrack_status {
	IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),		IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
	};		};

	/* Connection tracking event bits */
	enum ip_conntrack_events
	{
	/* New conntrack */
	IPCT_NEW_BIT = 0,
	IPCT_NEW = (1 << IPCT_NEW_BIT),

	/* Expected connection */
	IPCT_RELATED_BIT = 1,
	IPCT_RELATED = (1 << IPCT_RELATED_BIT),

	/* Destroyed conntrack */
	IPCT_DESTROY_BIT = 2,
	IPCT_DESTROY = (1 << IPCT_DESTROY_BIT),

	/* Timer has been refreshed */
	IPCT_REFRESH_BIT = 3,
	IPCT_REFRESH = (1 << IPCT_REFRESH_BIT),

	/* Status has changed */
	IPCT_STATUS_BIT = 4,
	IPCT_STATUS = (1 << IPCT_STATUS_BIT),

	/* Update of protocol info */
	IPCT_PROTOINFO_BIT = 5,
	IPCT_PROTOINFO = (1 << IPCT_PROTOINFO_BIT),

	/* Volatile protocol info */
	IPCT_PROTOINFO_VOLATILE_BIT = 6,
	IPCT_PROTOINFO_VOLATILE = (1 << IPCT_PROTOINFO_VOLATILE_BIT),

	/* New helper for conntrack */
	IPCT_HELPER_BIT = 7,
	IPCT_HELPER = (1 << IPCT_HELPER_BIT),

	/* Update of helper info */
	IPCT_HELPINFO_BIT = 8,
	IPCT_HELPINFO = (1 << IPCT_HELPINFO_BIT),

	/* Volatile helper info */
	IPCT_HELPINFO_VOLATILE_BIT = 9,
	IPCT_HELPINFO_VOLATILE = (1 << IPCT_HELPINFO_VOLATILE_BIT),

	/* NAT info */
	IPCT_NATINFO_BIT = 10,
	IPCT_NATINFO = (1 << IPCT_NATINFO_BIT),

	/* Counter highest bit has been set, unused */
	IPCT_COUNTER_FILLING_BIT = 11,
	IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),

	/* Mark is set */
	IPCT_MARK_BIT = 12,
	IPCT_MARK = (1 << IPCT_MARK_BIT),

	/* NAT sequence adjustment */
	IPCT_NATSEQADJ_BIT = 13,
	IPCT_NATSEQADJ = (1 << IPCT_NATSEQADJ_BIT),

	/* Secmark is set */
	IPCT_SECMARK_BIT = 14,
	IPCT_SECMARK = (1 << IPCT_SECMARK_BIT),
	};

	enum ip_conntrack_expect_events {
	IPEXP_NEW_BIT = 0,
	IPEXP_NEW = (1 << IPEXP_NEW_BIT),
	};

	#ifdef __KERNEL__		#ifdef __KERNEL__
	struct ip_conntrack_stat		struct ip_conntrack_stat
	{		{

include/linux/netfilter/nf_conntrack_tcp.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,8 @@ enum tcp_conntrack {
	TCP_CONNTRACK_LAST_ACK,		TCP_CONNTRACK_LAST_ACK,
	TCP_CONNTRACK_TIME_WAIT,		TCP_CONNTRACK_TIME_WAIT,
	TCP_CONNTRACK_CLOSE,		TCP_CONNTRACK_CLOSE,
	TCP_CONNTRACK_LISTEN,		TCP_CONNTRACK_LISTEN, /* obsolete */
			#define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
	TCP_CONNTRACK_MAX,		TCP_CONNTRACK_MAX,
	TCP_CONNTRACK_IGNORE		TCP_CONNTRACK_IGNORE
	};		};

include/linux/netfilter/nfnetlink.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,8 @@ struct nfgenmsg {
	#define NFNL_SUBSYS_CTNETLINK_EXP 2		#define NFNL_SUBSYS_CTNETLINK_EXP 2
	#define NFNL_SUBSYS_QUEUE 3		#define NFNL_SUBSYS_QUEUE 3
	#define NFNL_SUBSYS_ULOG 4		#define NFNL_SUBSYS_ULOG 4
	#define NFNL_SUBSYS_COUNT 5		#define NFNL_SUBSYS_OSF 5
			#define NFNL_SUBSYS_COUNT 6

	#ifdef __KERNEL__		#ifdef __KERNEL__

	@@ -75,7 +76,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);

	extern int nfnetlink_has_listeners(unsigned int group);		extern int nfnetlink_has_listeners(unsigned int group);
	extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,		extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
	int echo);		int echo, gfp_t flags);
	extern void nfnetlink_set_err(u32 pid, u32 group, int error);		extern void nfnetlink_set_err(u32 pid, u32 group, int error);
	extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);		extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);

include/linux/netfilter/nfnetlink_conntrack.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,7 @@ enum ctattr_protoinfo_dccp {
	CTA_PROTOINFO_DCCP_UNSPEC,		CTA_PROTOINFO_DCCP_UNSPEC,
	CTA_PROTOINFO_DCCP_STATE,		CTA_PROTOINFO_DCCP_STATE,
	CTA_PROTOINFO_DCCP_ROLE,		CTA_PROTOINFO_DCCP_ROLE,
			CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
	__CTA_PROTOINFO_DCCP_MAX,		__CTA_PROTOINFO_DCCP_MAX,
	};		};
	#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)		#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)