ipv6: ip6mr: move unres_queue and timer to per-namespace data

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

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 1f11ebc..43d842a 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -60,6 +60,8 @@ struct netns_ipv6 {
        struct sock             *igmp_sk;
 #ifdef CONFIG_IPV6_MROUTE
        struct sock             *mroute6_sk;
+       struct timer_list       ipmr_expire_timer;
+       struct mfc6_cache       *mfc6_unres_queue;
        struct mfc6_cache       **mfc6_cache_array;
        struct mif_device       *vif6_table;
        int                     maxvif;