ipv6: fix race condition regarding dst->expires and dst->from.

[deliverable/linux.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 3da47e0a4a1ffdfce7369980dca71c58cf1606a5..853cda11e518be98cbcf0d4bd5fa9270c804d2f5 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -36,13 +36,9 @@ struct dst_entry {
        struct net_device       *dev;
        struct  dst_ops         *ops;
        unsigned long           _metrics;
-       union {
-               unsigned long           expires;
-               /* point to where the dst_entry copied from */
-               struct dst_entry        *from;
-       };
+       unsigned long           expires;
        struct dst_entry        *path;
-       void                    *__pad0;
+       struct dst_entry        *from;
 #ifdef CONFIG_XFRM
        struct xfrm_state       *xfrm;
 #else