Merge branch 'master' of /repos/git/net-next-2.6

[safe/jmp/linux-2.6] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 977f482..2764994 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -37,9 +37,12 @@ struct netns_ipv4 {
        struct xt_table         *iptable_mangle;
        struct xt_table         *iptable_raw;
        struct xt_table         *arptable_filter;
+#ifdef CONFIG_SECURITY
        struct xt_table         *iptable_security;
+#endif
        struct xt_table         *nat_table;
        struct hlist_head       *nat_bysource;
+       unsigned int            nat_htable_size;
        int                     nat_vmalloced;
 #endif
 
@@ -54,5 +57,18 @@ struct netns_ipv4 {
 
        struct timer_list rt_secret_timer;
        atomic_t rt_genid;
+
+#ifdef CONFIG_IP_MROUTE
+       struct sock             *mroute_sk;
+       struct mfc_cache        **mfc_cache_array;
+       struct vif_device       *vif_table;
+       int                     maxvif;
+       atomic_t                cache_resolve_queue_len;
+       int                     mroute_do_assert;
+       int                     mroute_do_pim;
+#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
+       int                     mroute_reg_vif_num;
+#endif
+#endif
 };
 #endif