1 files changed, 3 insertions, 17 deletions

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c5f3d53548e2..fa04b246c9ae 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -27,7 +27,8 @@
 #define MRT_DEL_MFC     (MRT_BASE+5)    /* Delete a multicast forwarding entry  */
 #define MRT_VERSION     (MRT_BASE+6)    /* Get the kernel multicast version     */
 #define MRT_ASSERT      (MRT_BASE+7)    /* Activate PIM assert mode             */
-#define MRT_PIM         (MRT_BASE+8)    /* enable PIM code      */
+#define MRT_PIM         (MRT_BASE+8)    /* enable PIM code                      */
+#define MRT_TABLE       (MRT_BASE+9)    /* Specify mroute table ID              */
 
 #define SIOCGETVIFCNT   SIOCPROTOPRIVATE        /* IP protocol privates */
 #define SIOCGETSGCNT    (SIOCPROTOPRIVATE+1)
@@ -191,10 +192,7 @@ struct vif_device {
 #define VIFF_STATIC 0x8000
 
 struct mfc_cache {
-        struct mfc_cache *next;                 /* Next entry on cache line     */
-#ifdef CONFIG_NET_NS
-        struct net *mfc_net;
-#endif
+        struct list_head list;
         __be32 mfc_mcastgrp;                    /* Group the entry belongs to   */
         __be32 mfc_origin;                      /* Source of packet             */
         vifi_t mfc_parent;                      /* Source interface             */
@@ -217,18 +215,6 @@ struct mfc_cache {
         } mfc_un;
 };
 
-static inline
-struct net *mfc_net(const struct mfc_cache *mfc)
-{
-        return read_pnet(&mfc->mfc_net);
-}
-
-static inline
-void mfc_net_set(struct mfc_cache *mfc, struct net *net)
-{
-        write_pnet(&mfc->mfc_net, hold_net(net));
-}
-
 #define MFC_STATIC              1
 #define MFC_NOTIFY              2