diff options
| author | wangweidong <wangweidong1@huawei.com> | 2013-12-12 02:36:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-16 18:48:35 +0100 |
| commit | 3b8401fe9dba490b81b30deaa9bf4f89120bb5ba (patch) | |
| tree | 39f9a586f12d712fa0276df3187a7ef8807009bb /net/tipc | |
| parent | tipc: remove unnecessary variables and conditions (diff) | |
| download | linux-3b8401fe9dba490b81b30deaa9bf4f89120bb5ba.tar.xz linux-3b8401fe9dba490b81b30deaa9bf4f89120bb5ba.zip | |
tipc: kill unnecessary goto's
Remove a number of needless 'goto exit' in send_stream
when the socket is in an unconnected state.
This patch is cosmetic and does not alter the operation of
TIPC in any way.
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.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.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 32037c57937d..844bf349bb81 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -751,16 +751,14 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, /* Handle special cases where there is no connection */ if (unlikely(sock->state != SS_CONNECTED)) { - if (sock->state == SS_UNCONNECTED) { + res = -ENOTCONN; + + if (sock->state == SS_UNCONNECTED) res = send_packet(NULL, sock, m, total_len); - goto exit; - } else if (sock->state == SS_DISCONNECTING) { + else if (sock->state == SS_DISCONNECTING) res = -EPIPE; - goto exit; - } else { - res = -ENOTCONN; - goto exit; - } + + goto exit; } if (unlikely(m->msg_name)) { |