6 files changed, 10 insertions, 4 deletions

diff --git a/kernel/include/net/netns/conntrack.h b/kernel/include/net/netns/conntrack.h
index 29d6a94db..723b61c82 100644
--- a/kernel/include/net/netns/conntrack.h
+++ b/kernel/include/net/netns/conntrack.h
@@ -68,7 +68,6 @@ struct ct_pcpu {
 	spinlock_t		lock;
 	struct hlist_nulls_head unconfirmed;
 	struct hlist_nulls_head dying;
-	struct hlist_nulls_head tmpl;
 };
 
 struct netns_ct {
diff --git a/kernel/include/net/netns/ipv4.h b/kernel/include/net/netns/ipv4.h
index b4bdbe10b..dd0751e76 100644
--- a/kernel/include/net/netns/ipv4.h
+++ b/kernel/include/net/netns/ipv4.h
@@ -19,6 +19,7 @@ struct sock;
 struct local_ports {
 	seqlock_t	lock;
 	int		range[2];
+	bool		warned;
 };
 
 struct ping_group_range {
@@ -78,6 +79,8 @@ struct netns_ipv4 {
 	struct local_ports ip_local_ports;
 
 	int sysctl_tcp_ecn;
+	int sysctl_tcp_ecn_fallback;
+
 	int sysctl_ip_no_pmtu_disc;
 	int sysctl_ip_fwd_use_pmtu;
 	int sysctl_ip_nonlocal_bind;
diff --git a/kernel/include/net/netns/ipv6.h b/kernel/include/net/netns/ipv6.h
index d2527bf81..c0368db6d 100644
--- a/kernel/include/net/netns/ipv6.h
+++ b/kernel/include/net/netns/ipv6.h
@@ -31,9 +31,11 @@ struct netns_sysctl_ipv6 {
 	int auto_flowlabels;
 	int icmpv6_time;
 	int anycast_src_echo_reply;
+	int ip_nonlocal_bind;
 	int fwmark_reflect;
 	int idgen_retries;
 	int idgen_delay;
+	int flowlabel_state_ranges;
 };
 
 struct netns_ipv6 {
diff --git a/kernel/include/net/netns/netfilter.h b/kernel/include/net/netns/netfilter.h
index 88740024c..38aa4983e 100644
--- a/kernel/include/net/netns/netfilter.h
+++ b/kernel/include/net/netns/netfilter.h
@@ -1,9 +1,9 @@
 #ifndef __NETNS_NETFILTER_H
 #define __NETNS_NETFILTER_H
 
-#include <linux/proc_fs.h>
-#include <linux/netfilter.h>
+#include <linux/netfilter_defs.h>
 
+struct proc_dir_entry;
 struct nf_logger;
 
 struct netns_nf {
@@ -14,5 +14,6 @@ struct netns_nf {
 #ifdef CONFIG_SYSCTL
 	struct ctl_table_header *nf_log_dir_header;
 #endif
+	struct list_head hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
 };
 #endif
diff --git a/kernel/include/net/netns/nftables.h b/kernel/include/net/netns/nftables.h
index eee608b12..c80781146 100644
--- a/kernel/include/net/netns/nftables.h
+++ b/kernel/include/net/netns/nftables.h
@@ -13,6 +13,7 @@ struct netns_nftables {
 	struct nft_af_info	*inet;
 	struct nft_af_info	*arp;
 	struct nft_af_info	*bridge;
+	struct nft_af_info	*netdev;
 	unsigned int		base_seq;
 	u8			gencursor;
 };
diff --git a/kernel/include/net/netns/x_tables.h b/kernel/include/net/netns/x_tables.h
index 4d6597ad6..c8a7681ef 100644
--- a/kernel/include/net/netns/x_tables.h
+++ b/kernel/include/net/netns/x_tables.h
@@ -2,7 +2,7 @@
 #define __NETNS_X_TABLES_H
 
 #include <linux/list.h>
-#include <linux/netfilter.h>
+#include <linux/netfilter_defs.h>
 
 struct ebt_table;