ipv6: Replace inet6_ifaddr->dead with state

[safe/jmp/linux-2.6] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 7fc409c..612069b 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -8,6 +8,7 @@
 #ifndef _NET_DST_H
 #define _NET_DST_H
 
+#include <net/dst_ops.h>
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/rcupdate.h>
@@ -35,8 +36,7 @@
 
 struct sk_buff;
 
-struct dst_entry
-{
+struct dst_entry {
        struct rcu_head         rcu_head;
        struct dst_entry        *child;
        struct net_device       *dev;
@@ -83,8 +83,6 @@ struct dst_entry
         * (L1_CACHE_SIZE would be too much)
         */
 #ifdef CONFIG_64BIT
-       long                    __pad_to_align_refcnt[2];
-#else
        long                    __pad_to_align_refcnt[1];
 #endif
        /*
@@ -102,28 +100,6 @@ struct dst_entry
        };
 };
 
-
-struct dst_ops
-{
-       unsigned short          family;
-       __be16                  protocol;
-       unsigned                gc_thresh;
-
-       int                     (*gc)(struct dst_ops *ops);
-       struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
-       void                    (*destroy)(struct dst_entry *);
-       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);
-       int                     (*local_out)(struct sk_buff *skb);
-
-       atomic_t                entries;
-       struct kmem_cache               *kmem_cachep;
-       struct net              *dst_net;
-};
-
 #ifdef __KERNEL__
 
 static inline u32
@@ -132,6 +108,12 @@ dst_metric(const struct dst_entry *dst, int metric)
        return dst->metrics[metric-1];
 }
 
+static inline u32
+dst_feature(const struct dst_entry *dst, u32 feature)
+{
+       return dst_metric(dst, RTAX_FEATURES) & feature;
+}
+
 static inline u32 dst_mtu(const struct dst_entry *dst)
 {
        u32 mtu = dst_metric(dst, RTAX_MTU);
@@ -157,7 +139,7 @@ static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
-       int ret = dst_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
+       int ret = dst_feature(dst,  RTAX_FEATURE_ALLFRAG);
        /* Yes, _exactly_. This is paranoia. */
        barrier();
        return ret;
@@ -186,6 +168,12 @@ static inline void dst_use(struct dst_entry *dst, unsigned long time)
        dst->lastuse = time;
 }
 
+static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
+{
+       dst->__use++;
+       dst->lastuse = time;
+}
+
 static inline
 struct dst_entry * dst_clone(struct dst_entry * dst)
 {
@@ -195,11 +183,67 @@ struct dst_entry * dst_clone(struct dst_entry * dst)
 }
 
 extern void dst_release(struct dst_entry *dst);
+
+static inline void refdst_drop(unsigned long refdst)
+{
+       if (!(refdst & SKB_DST_NOREF))
+               dst_release((struct dst_entry *)(refdst & SKB_DST_PTRMASK));
+}
+
+/**
+ * skb_dst_drop - drops skb dst
+ * @skb: buffer
+ *
+ * Drops dst reference count if a reference was taken.
+ */
 static inline void skb_dst_drop(struct sk_buff *skb)
 {
-       if (skb->_skb_dst)
-               dst_release(skb_dst(skb));
-       skb->_skb_dst = 0UL;
+       if (skb->_skb_refdst) {
+               refdst_drop(skb->_skb_refdst);
+               skb->_skb_refdst = 0UL;
+       }
+}
+
+static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb)
+{
+       nskb->_skb_refdst = oskb->_skb_refdst;
+       if (!(nskb->_skb_refdst & SKB_DST_NOREF))
+               dst_clone(skb_dst(nskb));
+}
+
+/**
+ * skb_dst_force - makes sure skb dst is refcounted
+ * @skb: buffer
+ *
+ * If dst is not yet refcounted, let's do it
+ */
+static inline void skb_dst_force(struct sk_buff *skb)
+{
+       if (skb_dst_is_noref(skb)) {
+               WARN_ON(!rcu_read_lock_held());
+               skb->_skb_refdst &= ~SKB_DST_NOREF;
+               dst_clone(skb_dst(skb));
+       }
+}
+
+
+/**
+ *     skb_tunnel_rx - prepare skb for rx reinsert
+ *     @skb: buffer
+ *     @dev: tunnel device
+ *
+ *     After decapsulation, packet is going to re-enter (netif_rx()) our stack,
+ *     so make some cleanups, and perform accounting.
+ */
+static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
+{
+       skb->dev = dev;
+       /* TODO : stats should be SMP safe */
+       dev->stats.rx_packets++;
+       dev->stats.rx_bytes += skb->len;
+       skb->rxhash = 0;
+       skb_dst_drop(skb);
+       nf_reset(skb);
 }
 
 /* Children define the path of the packet through the
@@ -243,13 +287,6 @@ static inline void dst_confirm(struct dst_entry *dst)
                neigh_confirm(dst->neighbour);
 }
 
-static inline void dst_negative_advice(struct dst_entry **dst_p)
-{
-       struct dst_entry * dst = *dst_p;
-       if (dst && dst->ops->negative_advice)
-               *dst_p = dst->ops->negative_advice(dst);
-}
-
 static inline void dst_link_failure(struct sk_buff *skb)
 {
        struct dst_entry *dst = skb_dst(skb);