---

yaml --- r: 243233 b: refs/heads/master c: e433430 h: refs/heads/master i: 243231: 37f9550 v: v3
git-mirror · Mar 28, 2011 · 9583312 · 9583312
1 parent fedd915
commit 9583312
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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));