ipv6: ip6mr: support multiple tables

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

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index dfeb2d7c425b52cfb69831221b9dc6768830bfc9..81abfcb2eb4e7d8394dbf9ec5da60a361cbb34c3 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -36,7 +36,9 @@ struct netns_ipv6 {
        struct xt_table         *ip6table_filter;
        struct xt_table         *ip6table_mangle;
        struct xt_table         *ip6table_raw;
+#ifdef CONFIG_SECURITY
        struct xt_table         *ip6table_security;
+#endif
 #endif
        struct rt6_info         *ip6_null_entry;
        struct rt6_statistics   *rt6_stats;
@@ -57,15 +59,11 @@ struct netns_ipv6 {
        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;
+#ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
+       struct mr6_table        *mrt6;
+#else
+       struct list_head        mr6_tables;
+       struct fib_rules_ops    *mr6_rules_ops;
 #endif
 #endif
 };