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

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter/IPVS updates for net-next: 1) Inspect the reply packets coming from DR/TUN and refresh connection state and timeout, from longguang yue and Julian Anastasov. 2) Series to add support for the inet ingress chain type in nf_tables. ====================

Jakub Kicinski committed 6 years ago

Commit a3082832 parents 547848a 793d5d611 files · +282 −76Browse files

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

Unified · Split

include/uapi/linux/netfilter.h+1−0

@@ -45,6 +45,7 @@ enum nf_inet_hooks { · 44 unmodified lines
45	45	NF_INET_FORWARD,
46	46	NF_INET_LOCAL_OUT,
47	47	NF_INET_POST_ROUTING,
	48	+ NF_INET_INGRESS,
48	49	NF_INET_NUMHOOKS
49	50	};
50	51