Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / include / net / netns / ipv6.h

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 050d08809ef2942be02c90f1b1587237d9b50fc7..ac053be6c25625671d3f037929444d15a68dfdb3 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -12,8 +12,8 @@ struct ctl_table_header;
 struct netns_sysctl_ipv6 {
 #ifdef CONFIG_SYSCTL
        struct ctl_table_header *table;
+       struct ctl_table_header *frags_hdr;
 #endif
-       struct inet_frags_ctl frags;
        int bindv6only;
        int flush_delay;
        int ip6_rt_max_size;
@@ -23,9 +23,36 @@ struct netns_sysctl_ipv6 {
        int ip6_rt_gc_elasticity;
        int ip6_rt_mtu_expires;
        int ip6_rt_min_advmss;
+       int icmpv6_time;
 };
 
 struct netns_ipv6 {
        struct netns_sysctl_ipv6 sysctl;
+       struct ipv6_devconf     *devconf_all;
+       struct ipv6_devconf     *devconf_dflt;
+       struct netns_frags      frags;
+#ifdef CONFIG_NETFILTER
+       struct xt_table         *ip6table_filter;
+       struct xt_table         *ip6table_mangle;
+       struct xt_table         *ip6table_raw;
+#endif
+       struct rt6_info         *ip6_null_entry;
+       struct rt6_statistics   *rt6_stats;
+       struct timer_list       *ip6_fib_timer;
+       struct hlist_head       *fib_table_hash;
+       struct fib6_table       *fib6_main_tbl;
+       struct dst_ops          *ip6_dst_ops;
+       unsigned int             ip6_rt_gc_expire;
+       unsigned long            ip6_rt_last_gc;
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+       struct rt6_info         *ip6_prohibit_entry;
+       struct rt6_info         *ip6_blk_hole_entry;
+       struct fib6_table       *fib6_local_tbl;
+       struct fib_rules_ops    *fib6_rules_ops;
+#endif
+       struct sock             **icmp_sk;
+       struct sock             *ndisc_sk;
+       struct sock             *tcp_sk;
+       struct sock             *igmp_sk;
 };
 #endif