summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-27 10:09:39 +0800
committerDavid S. Miller <davem@davemloft.net>2014-01-02 03:30:35 -0500
commitb0555976973aa37f080188665aff2c55aa60f47d (patch)
tree088bc8d695818577ae67e04f82535b2bd24941cd /net/tipc
parentfbe4d4565badba393a94927e16ae66654a025dca (diff)
tipc: make the code look more readable
In commit 3b8401fe9d ("tipc: kill unnecessary goto's") didn't make the code look most readable, so fix it. This patch is cosmetic and does not change the operation of TIPC in any way. Suggested-by: David Laight <David.Laight@ACULAB.COM> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/socket.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 83f466e57fe..5efdeef06f9 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -751,13 +751,10 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
/* Handle special cases where there is no connection */
if (unlikely(sock->state != SS_CONNECTED)) {
- res = -ENOTCONN;
-
if (sock->state == SS_UNCONNECTED)
res = send_packet(NULL, sock, m, total_len);
- else if (sock->state == SS_DISCONNECTING)
- res = -EPIPE;
-
+ else
+ res = sock->state == SS_DISCONNECTING ? -EPIPE : -ENOTCONN;
goto exit;
}