Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...

1 files changed, 10 insertions, 5 deletions

diff --git a/include/net/dst.h b/include/net/dst.h
index 62b7e7598e9a..e12a8ce0b9b3 100644
--- 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];
 };