quota: drop remount argument to ->quota_on and ->quota_off

[safe/jmp/linux-2.6] / include / linux / mroute.h

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index de7780a..fa04b24 100644 (file)
--- 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,7 +192,7 @@ struct vif_device {
 #define VIFF_STATIC 0x8000
 
 struct mfc_cache {
-       struct mfc_cache *next;                 /* Next entry on cache line     */
+       struct list_head list;
        __be32 mfc_mcastgrp;                    /* Group the entry belongs to   */
        __be32 mfc_origin;                      /* Source of packet             */
        vifi_t mfc_parent;                      /* Source interface             */