diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-26 02:48:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-26 02:48:22 -0400 |
commit | a3b0a5a9d004002a9cf9cf7a9d10cf1447a73d2b (patch) | |
tree | dab990b30b9c5d677c9c3408c2f8e73a5e50db72 | |
parent | 4b087b28a629cc9388e42fdccdcd929deaa7ac81 (diff) |
[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>
-rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
969 | restart: | 969 | restart: |
970 | if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) && | 970 | if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) && |
971 | (flags & MSG_DONTWAIT))) { | 971 | (flags & MSG_DONTWAIT))) { |
972 | res = (sz_copied == 0) ? -EWOULDBLOCK : 0; | 972 | res = -EWOULDBLOCK; |
973 | goto exit; | 973 | goto exit; |
974 | } | 974 | } |
975 | 975 | ||
@@ -1060,7 +1060,7 @@ restart: | |||
1060 | 1060 | ||
1061 | exit: | 1061 | exit: |
1062 | up(&tsock->sem); | 1062 | up(&tsock->sem); |
1063 | return res ? res : sz_copied; | 1063 | return sz_copied ? sz_copied : res; |
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | /** | 1066 | /** |