NetLabel: introduce a new kernel configuration API for NetLabel

[powerpc.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 31468c9..e3ac7d0 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -56,7 +56,11 @@ struct dst_entry
        struct dst_entry        *path;
 
        unsigned long           rate_last;      /* rate limiting for ICMP */
-       unsigned long           rate_tokens;
+       unsigned int            rate_tokens;
+
+#ifdef CONFIG_NET_CLS_ROUTE
+       __u32                   tclassid;
+#endif
 
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
@@ -65,10 +69,6 @@ struct dst_entry
        int                     (*input)(struct sk_buff*);
        int                     (*output)(struct sk_buff*);
 
-#ifdef CONFIG_NET_CLS_ROUTE
-       __u32                   tclassid;
-#endif
-
        struct  dst_ops         *ops;
                
        unsigned long           lastuse;
@@ -80,7 +80,6 @@ struct dst_entry
                struct rt6_info   *rt6_next;
                struct dn_route  *dn_next;
        };
-       char                    info[0];
 };
 
 
@@ -90,7 +89,7 @@ struct dst_ops
        __be16                  protocol;
        unsigned                gc_thresh;
 
-       int                     (*gc)(void);
+       int                     (*gc)(struct dst_ops *ops);
        struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
        void                    (*destroy)(struct dst_entry *);
        void                    (*ifdown)(struct dst_entry *,
@@ -103,6 +102,7 @@ struct dst_ops
 
        atomic_t                entries;
        struct kmem_cache               *kmem_cachep;
+       struct net              *dst_net;
 };
 
 #ifdef __KERNEL__