Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/include/net/dst.h b/include/net/dst.h
index 612069b..81d1413 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -250,11 +250,11 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
  * Linux networking.  Thus, destinations are stackable.
  */
 
  * Linux networking.  Thus, destinations are stackable.
  */
 

-static inline struct dst_entry *dst_pop(struct dst_entry *dst)
+static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)

 {
 {

-       struct dst_entry *child = dst_clone(dst->child);
+       struct dst_entry *child = skb_dst(skb)->child;

 
 

-       dst_release(dst);
+       skb_dst_drop(skb);

        return child;
 }
 
        return child;
 }