- sync fedora branch

[linux-2.6.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 7ffb470..4a056a6 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -42,12 +42,14 @@ struct dst_entry
        int                     __use;
        struct dst_entry        *child;
        struct net_device       *dev;
-       int                     obsolete;
+       short                   error;
+       short                   obsolete;
        int                     flags;
 #define DST_HOST               1
 #define DST_NOXFRM             2
 #define DST_NOPOLICY           4
 #define DST_NOHASH             8
+#define DST_BALANCED            0x10
        unsigned long           lastuse;
        unsigned long           expires;
 
@@ -60,8 +62,6 @@ struct dst_entry
        unsigned long           rate_last;      /* rate limiting for ICMP */
        unsigned long           rate_tokens;
 
-       int                     error;
-
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
        struct xfrm_state       *xfrm;
@@ -89,7 +89,8 @@ struct dst_ops
        int                     (*gc)(void);
        struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
        void                    (*destroy)(struct dst_entry *);
-       void                    (*ifdown)(struct dst_entry *, int how);
+       void                    (*ifdown)(struct dst_entry *,
+                                         struct net_device *dev, int how);
        struct dst_entry *      (*negative_advice)(struct dst_entry *);
        void                    (*link_failure)(struct sk_buff *);
        void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
@@ -108,19 +109,23 @@ dst_metric(const struct dst_entry *dst, int metric)
        return dst->metrics[metric-1];
 }
 
-static inline u32
-dst_path_metric(const struct dst_entry *dst, int metric)
+static inline u32 dst_mtu(const struct dst_entry *dst)
 {
-       return dst->path->metrics[metric-1];
+       u32 mtu = dst_metric(dst, RTAX_MTU);
+       /*
+        * Alexey put it here, so ask him about it :)
+        */
+       barrier();
+       return mtu;
 }
 
 static inline u32
-dst_pmtu(const struct dst_entry *dst)
+dst_allfrag(const struct dst_entry *dst)
 {
-       u32 mtu = dst_path_metric(dst, RTAX_MTU);
+       int ret = dst_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
        /* Yes, _exactly_. This is paranoia. */
        barrier();
-       return mtu;
+       return ret;
 }
 
 static inline int
@@ -147,6 +152,7 @@ void dst_release(struct dst_entry * dst)
 {
        if (dst) {
                WARN_ON(atomic_read(&dst->__refcnt) < 1);
+               smp_mb__before_atomic_dec();
                atomic_dec(&dst->__refcnt);
        }
 }
@@ -247,6 +253,13 @@ static inline int dst_input(struct sk_buff *skb)
        }
 }
 
+static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)
+{
+       if (dst->obsolete)
+               dst = dst->ops->check(dst, cookie);
+       return dst;
+}
+
 extern void            dst_init(void);
 
 struct flowi;