From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 26 Jun 2006 06:48:22 +0000 (-0700)
Subject: [TIPC]: Simplify code for returning partial success of stream send request.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3b0a5a9d004002a9cf9cf7a9d10cf1447a73d2b;p=linux-beck.git

[TIPC]: Simplify code for returning partial success of stream send request.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index abecf2d422ff..6d4d2b0063aa 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -969,7 +969,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 restart:
 	if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
 		     (flags & MSG_DONTWAIT))) {
-		res = (sz_copied == 0) ? -EWOULDBLOCK : 0;
+		res = -EWOULDBLOCK;
 		goto exit;
 	}
 
@@ -1060,7 +1060,7 @@ restart:
 
 exit:
 	up(&tsock->sem);
-	return res ? res : sz_copied;
+	return sz_copied ? sz_copied : res;
 }
 
 /**