ipv4: ipmr: move unres_queue and timer to per-namespace data

[pandora-kernel.git] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 9a4b8b7..b15e518 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -37,7 +37,9 @@ 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;
@@ -58,6 +60,8 @@ struct netns_ipv4 {
 
 #ifdef CONFIG_IP_MROUTE
        struct sock             *mroute_sk;
+       struct timer_list       ipmr_expire_timer;
+       struct mfc_cache        *mfc_unres_queue;
        struct mfc_cache        **mfc_cache_array;
        struct vif_device       *vif_table;
        int                     maxvif;