Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 2932721180c0902e5fdd42076208332a36a0242c..afab4e4cbac78ebfeb1d57497379bf515bade0ac 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -55,5 +55,17 @@ struct netns_ipv6 {
        struct sock             *ndisc_sk;
        struct sock             *tcp_sk;
        struct sock             *igmp_sk;
+#ifdef CONFIG_IPV6_MROUTE
+       struct sock             *mroute6_sk;
+       struct mfc6_cache       **mfc6_cache_array;
+       struct mif_device       *vif6_table;
+       int                     maxvif;
+       atomic_t                cache_resolve_queue_len;
+       int                     mroute_do_assert;
+       int                     mroute_do_pim;
+#ifdef CONFIG_IPV6_PIMSM_V2
+       int                     mroute_reg_vif_num;
+#endif
+#endif
 };
 #endif