---

yaml --- r: 38558 b: refs/heads/master c: 1e0c14f h: refs/heads/master v: v3
git-mirror · Oct 4, 2006 · 4ac128b · 4ac128b
1 parent 546499a
commit 4ac128b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 132a55f3c5c0b1a364d32f65595ad8838c30a60e
+refs/heads/master: 1e0c14f49d6b393179f423abbac47f85618d3d46
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
@@ -675,6 +675,8 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 		udp_flush_pending_frames(sk);
 	else if (!corkreq)
 		err = udp_push_pending_frames(sk, up);
+	else if (unlikely(skb_queue_empty(&sk->sk_write_queue)))
+		up->pending = 0;
 	release_sock(sk);
 
 out:

diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
@@ -770,6 +770,8 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
 		udp_v6_flush_pending_frames(sk);
 	else if (!corkreq)
 		err = udp_v6_push_pending_frames(sk, up);
+	else if (unlikely(skb_queue_empty(&sk->sk_write_queue)))
+		up->pending = 0;
 
 	if (dst) {
 		if (connected) {