net: introduce DST_NOCACHE flag

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

diff --git a/include/net/dst.h b/include/net/dst.h
index 81d1413a87010967684febe7344169baa7d828ef..a217c838ec0dc649463a999c5c4d55cf6d53585d 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -43,10 +43,11 @@ struct dst_entry {
        short                   error;
        short                   obsolete;
        int                     flags;
-#define DST_HOST               1
-#define DST_NOXFRM             2
-#define DST_NOPOLICY           4
-#define DST_NOHASH             8
+#define DST_HOST               0x0001
+#define DST_NOXFRM             0x0002
+#define DST_NOPOLICY           0x0004
+#define DST_NOHASH             0x0008
+#define DST_NOCACHE            0x0010
        unsigned long           expires;
 
        unsigned short          header_len;     /* more space at head required */
@@ -227,6 +228,23 @@ static inline void skb_dst_force(struct sk_buff *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. (no accounting done)
+ */
+static inline void __skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
+{
+       skb->dev = dev;
+       skb->rxhash = 0;
+       skb_set_queue_mapping(skb, 0);
+       skb_dst_drop(skb);
+       nf_reset(skb);
+}
+
 /**
  *     skb_tunnel_rx - prepare skb for rx reinsert
  *     @skb: buffer
@@ -234,16 +252,14 @@ static inline void skb_dst_force(struct sk_buff *skb)
  *
  *     After decapsulation, packet is going to re-enter (netif_rx()) our stack,
  *     so make some cleanups, and perform accounting.
+ *     Note: this accounting is not SMP safe.
  */
 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);
+       __skb_tunnel_rx(skb, dev);
 }
 
 /* Children define the path of the packet through the