From 9583312b0b3ba9ec99dfde2559e1a7e2e013ba36 Mon Sep 17 00:00:00 2001 From: Steffen Klassert Date: Tue, 15 Mar 2011 21:09:32 +0000 Subject: [PATCH] --- yaml --- r: 243233 b: refs/heads/master c: e433430a0ca9cc1b851a83ac3b305e955b64880a h: refs/heads/master i: 243231: 37f9550e1aa8285951d43f91b31a9762043fd00c v: v3 --- [refs] | 2 +- trunk/include/net/dst.h | 2 +- trunk/net/xfrm/xfrm_output.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebc83460fbb9..23fd593586f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc07321ccc236f693ce1b6a8786f0a2e38bb87e +refs/heads/master: e433430a0ca9cc1b851a83ac3b305e955b64880a diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h index 2a46cbaef92d..75b95df4afe7 100644 --- a/trunk/include/net/dst.h +++ b/trunk/include/net/dst.h @@ -345,7 +345,7 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev) static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb) { - struct dst_entry *child = skb_dst(skb)->child; + struct dst_entry *child = dst_clone(skb_dst(skb)->child); skb_dst_drop(skb); return child; diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c index 8f3f0eedc5a4..47bacd8c0250 100644 --- a/trunk/net/xfrm/xfrm_output.c +++ b/trunk/net/xfrm/xfrm_output.c @@ -96,7 +96,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) err = -EHOSTUNREACH; goto error_nolock; } - skb_dst_set(skb, dst_clone(dst)); + skb_dst_set(skb, dst); x = dst->xfrm; } while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));