From 23b8f3c78e971b4457994b3fc38ef956529879d5 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Fri, 9 Feb 2007 16:26:55 -0800
Subject: [PATCH] --- yaml --- r: 47686 b: refs/heads/master c:
 1e19e02ca0c5e33ea73a25127dbe6c3b8fcaac4b h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/include/net/dst.h | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 57ae9ac32111..765123ac000a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c195c3fc4e95a06b0c0017506f074c94af99c35
+refs/heads/master: 1e19e02ca0c5e33ea73a25127dbe6c3b8fcaac4b
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index 5d62342e8bc4..e12a8ce0b9b3 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/include/net/dst.h
@@ -37,14 +37,7 @@ struct sk_buff;
 
 struct dst_entry
 {
-	union {
-		struct dst_entry *next;
-		struct rtable    *rt_next;
-		struct rt6_info   *rt6_next;
-		struct dn_route  *dn_next;
-	};
-	atomic_t		__refcnt;	/* client references	*/
-	int			__use;
+	struct rcu_head		rcu_head;
 	struct dst_entry	*child;
 	struct net_device       *dev;
 	short			error;
@@ -55,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 */
@@ -80,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];
 };