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 919cb0f20055c5017144ca5e0c348b3110347c8a..afab4e4cbac78ebfeb1d57497379bf515bade0ac 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -63,6 +63,9 @@ struct netns_ipv6 {
        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