History

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) Rename mss field to mss_option field in synproxy, from Fernando Mancera. 2) Use SYSCTL_{ZERO,ONE} definitions in conntrack, from Matteo Croce. 3) More strict validation of IPVS sysctl values, from Junwei Hu. 4) Remove unnecessary spaces after on the right hand side of assignments, from yangxingwu. 5) Add offload support for bitwise operation. 6) Extend the nft_offload_reg structure to store immediate date. 7) Collapse several ip_set header files into ip_set.h, from Jeremy Sowden. 8) Make netfilter headers compile with CONFIG_KERNEL_HEADER_TEST=y, from Jeremy Sowden. 9) Fix several sparse warnings due to missing prototypes, from Valdis Kletnieks. 10) Use static lock initialiser to ensure connlabel spinlock is initialized on boot time to fix sched/act_ct.c, patch from Florian Westphal. ====================

Jakub Kicinski committed 7 years ago

Commit c1626102 parents b753c5a 105333476 files · +527 −480Browse files

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

Unified · Split

include/uapi/linux/netfilter/xt_policy.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #ifndef _XT_POLICY_H
33 #define _XT_POLICY_H
44
5+#include <linux/netfilter.h>
56 #include <linux/types.h>
67 #include <linux/in.h>
78 #include <linux/in6.h>