3 files changed, 7 insertions, 2 deletions

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 7a911eca0f18..a053a19870cf 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -26,11 +26,14 @@ struct netns_ct {
         int                     sysctl_tstamp;
         int                     sysctl_checksum;
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
+        int                     sysctl_auto_assign_helper;
+        bool                    auto_assign_helper_warned;
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
         struct ctl_table_header *tstamp_sysctl_header;
         struct ctl_table_header *event_sysctl_header;
+        struct ctl_table_header *helper_sysctl_header;
 #endif
         char                    *slabname;
 };
diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h
index 548d78f2cc47..c06ac58ca107 100644
--- a/include/net/netns/hash.h
+++ b/include/net/netns/hash.h
@@ -5,7 +5,7 @@
 
 struct net;
 
-static inline unsigned net_hash_mix(struct net *net)
+static inline unsigned int net_hash_mix(struct net *net)
 {
 #ifdef CONFIG_NET_NS
         /*
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 81abfcb2eb4e..b42be53587ba 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -12,7 +12,9 @@ struct ctl_table_header;
 
 struct netns_sysctl_ipv6 {
 #ifdef CONFIG_SYSCTL
-        struct ctl_table_header *table;
+        struct ctl_table_header *hdr;
+        struct ctl_table_header *route_hdr;
+        struct ctl_table_header *icmp_hdr;
         struct ctl_table_header *frags_hdr;
 #endif
         int bindv6only;