1 files changed, 11 insertions, 28 deletions

diff --git a/include/net/dst.h b/include/net/dst.h
index d49d607dd2b3..c63d2c37f6e9 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -34,13 +34,9 @@ struct sk_buff;
 
 struct dst_entry {
         struct net_device       *dev;
-        struct rcu_head         rcu_head;
-        struct dst_entry        *child;
         struct  dst_ops         *ops;
         unsigned long           _metrics;
         unsigned long           expires;
-        struct dst_entry        *path;
-        struct dst_entry        *from;
 #ifdef CONFIG_XFRM
         struct xfrm_state       *xfrm;
 #else
@@ -59,8 +55,6 @@ struct dst_entry {
 #define DST_XFRM_QUEUE          0x0040
 #define DST_METADATA            0x0080
 
-        short                   error;
-
         /* A non-zero value of dst->obsolete forces by-hand validation
          * of the route entry.  Positive values are set by the generic
          * dst layer to indicate that the entry has been forcefully
@@ -76,35 +70,24 @@ struct dst_entry {
 #define DST_OBSOLETE_KILL       -2
         unsigned short          header_len;     /* more space at head required */
         unsigned short          trailer_len;    /* space to reserve at tail */
-        unsigned short          __pad3;
 
-#ifdef CONFIG_IP_ROUTE_CLASSID
-        __u32                   tclassid;
-#else
-        __u32                   __pad2;
-#endif
-
-#ifdef CONFIG_64BIT
-        /*
-         * Align __refcnt to a 64 bytes alignment
-         * (L1_CACHE_SIZE would be too much)
-         */
-        long                    __pad_to_align_refcnt[2];
-#endif
         /*
          * __refcnt wants to be on a different cache line from
          * input/output/ops or performance tanks badly
          */
-        atomic_t                __refcnt;       /* client references    */
+#ifdef CONFIG_64BIT
+        atomic_t                __refcnt;       /* 64-bit offset 64 */
+#endif
         int                     __use;
         unsigned long           lastuse;
         struct lwtunnel_state   *lwtstate;
-        union {
-                struct dst_entry        *next;
-                struct rtable __rcu     *rt_next;
-                struct rt6_info __rcu   *rt6_next;
-                struct dn_route __rcu   *dn_next;
-        };
+        struct rcu_head         rcu_head;
+        short                   error;
+        short                   __pad;
+        __u32                   tclassid;
+#ifndef CONFIG_64BIT
+        atomic_t                __refcnt;       /* 32-bit offset 64 */
+#endif
 };
 
 struct dst_metrics {
@@ -250,7 +233,7 @@ static inline void dst_hold(struct dst_entry *dst)
 {
         /*
          * If your kernel compilation stops here, please check
-         * __pad_to_align_refcnt declaration in struct dst_entry
+         * the placement of __refcnt in struct dst_entry
          */
         BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63);
         WARN_ON(atomic_inc_not_zero(&dst->__refcnt) == 0);