Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index e156e38e4ac37db61db754822e59877299e2f9a0..e12a8ce0b9b30737a39edbeaea90ba9edca76557 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -37,9 +37,7 @@ struct sk_buff;
 
 struct dst_entry
 {
-       struct dst_entry        *next;
-       atomic_t                __refcnt;       /* client references    */
-       int                     __use;
+       struct rcu_head         rcu_head;
        struct dst_entry        *child;
        struct net_device       *dev;
        short                   error;
@@ -50,7 +48,6 @@ struct dst_entry
 #define DST_NOPOLICY           4
 #define DST_NOHASH             8
 #define DST_BALANCED            0x10
-       unsigned long           lastuse;
        unsigned long           expires;
 
        unsigned short          header_len;     /* more space at head required */
@@ -75,8 +72,16 @@ struct dst_entry
 #endif
 
        struct  dst_ops         *ops;
-       struct rcu_head         rcu_head;
                
+       unsigned long           lastuse;
+       atomic_t                __refcnt;       /* client references    */
+       int                     __use;
+       union {
+               struct dst_entry *next;
+               struct rtable    *rt_next;
+               struct rt6_info   *rt6_next;
+               struct dn_route  *dn_next;
+       };
        char                    info[0];
 };
 
@@ -98,7 +103,7 @@ struct dst_ops
        int                     entry_size;
 
        atomic_t                entries;
-       kmem_cache_t            *kmem_cachep;
+       struct kmem_cache               *kmem_cachep;
 };
 
 #ifdef __KERNEL__