| Message ID | 52BCE163.2060706@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
You need to resubmit patch #1 along with this one, not just this one by itself. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2013/12/27 12:04, David Miller wrote: > > You need to resubmit patch #1 along with this one, not just this > one by itself. > > Thanks. > > As Ying pointed out that the patch #1 ("tipc: make the code look more better") does not provide any value. something like below: Actually the original logic seems better understandable for us because it immediately lets us know how to do if "tp_ptr->connected" is true. Instead the patch has a little negative effect on performance because "tp_ptr->connected" is true in most time. So I drop the patch #1. Now only this patch. Regards, Wang -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 83f466e..5efdeef 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; }
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> --- Change note: v3: fix the spelling error which pointed out by Sergei. v2: fix the problem "Referring commit purely by SHA1 ID is ambiguous" which pointed out by David. --- net/tipc/socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)