Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter fixes for your net tree, they are: 1) Fix a leak in IPVS, the sysctl table is not released accordingly when destroying a netns, patch from Tommi Rantala. 2) Fix a build error when TPROXY and socket are built-in but IPv6 defrag is compiled as module, from Florian Westphal. 3) Fix TCP tracket wrt. RFC5961 challenge ACK when in LAST_ACK state, patch from Jesper Dangaard Brouer. 4) Fix a bogus WARN_ON() in nf_tables when deleting a set element that stores a map, from Mirek Kratochvil. ====================

David S. Miller committed 11 years ago

Commit 1d605702 parents 7e14069 960bd2c5 files · +42 −5Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/netfilter/nf_conntrack_tcp.h+3−0

@@ -42,6 +42,9 @@ enum tcp_conntrack { · 41 unmodified lines
42	42	/* The field td_maxack has been set */
43	43	#define IP_CT_TCP_FLAG_MAXACK_SET 0x20
44	44
	45	+/* Marks possibility for expected RFC5961 challenge ACK */
	46	+#define IP_CT_EXP_CHALLENGE_ACK 0x40
	47	+
45	48	struct nf_ct_tcp_flags {
46	49	__u8 flags;
47	50	__u8 mask;