---

yaml --- r: 122123 b: refs/heads/master c: a21bba9 h: refs/heads/master i: 122121: 644fd13 122119: 923ac48 v: v3
git-mirror · Nov 25, 2008 · 08438bc · 08438bc
1 parent 10fc759
commit 08438bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e77d89b2fa8e3f8325b8ce7893ec3645f41aff5
+refs/heads/master: a21bba945430f3f5e00c349665f88cdacdb32a8d
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -1284,7 +1284,12 @@ int ip_push_pending_frames(struct sock *sk)
 
 	skb->priority = sk->sk_priority;
 	skb->mark = sk->sk_mark;
-	skb->dst = dst_clone(&rt->u.dst);
+	/*
+	 * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec
+	 * on dst refcount
+	 */
+	inet->cork.dst = NULL;
+	skb->dst = &rt->u.dst;
 
 	if (iph->protocol == IPPROTO_ICMP)
 		icmp_out_count(net, ((struct icmphdr *)