From: Wang Weidong <wangweidong1@huawei.com>
To: <jon.maloy@ericsson.com>, <allan.stephens@windriver.com>,
<davem@davemloft.net>
Cc: <David.Laight@ACULAB.COM>, <netdev@vger.kernel.org>
Subject: [PATCH net-next 1/2] tipc: make the code look more better
Date: Tue, 17 Dec 2013 15:03:46 +0800 [thread overview]
Message-ID: <1387263827-20876-2-git-send-email-wangweidong1@huawei.com> (raw)
In-Reply-To: <1387263827-20876-1-git-send-email-wangweidong1@huawei.com>
make the code look more better than commit 0cee6bbe06f does.
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>
---
net/tipc/port.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 5fd4c8c..ee81be0 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -832,14 +832,13 @@ exit:
*/
int __tipc_disconnect(struct tipc_port *tp_ptr)
{
- if (tp_ptr->connected) {
- tp_ptr->connected = 0;
- /* let timer expire on it's own to avoid deadlock! */
- tipc_nodesub_unsubscribe(&tp_ptr->subscription);
- return 0;
- }
+ if (!tp_ptr->connected)
+ return -ENOTCONN;
- return -ENOTCONN;
+ tp_ptr->connected = 0;
+ /* let timer expire on it's own to avoid deadlock! */
+ tipc_nodesub_unsubscribe(&tp_ptr->subscription);
+ return 0;
}
/*
--
1.7.12
next prev parent reply other threads:[~2013-12-17 7:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 7:03 [PATCH net-next 0/2] tipc: do some fixups Wang Weidong
2013-12-17 7:03 ` Wang Weidong [this message]
2013-12-17 7:03 ` [PATCH net-next 2/2] tipc: make the code look more readability Wang Weidong
2013-12-27 1:45 ` [PATCH net-next v3 2/2] tipc: make the code look more readable Wang Weidong
2013-12-27 1:51 ` Ying Xue
2013-12-27 1:59 ` Wang Weidong
2013-12-27 4:04 ` David Miller
2013-12-27 2:09 ` [PATCH net-next RESEND v3] " Wang Weidong
2013-12-27 4:04 ` David Miller
2013-12-27 4:21 ` Wang Weidong
2013-12-24 22:45 ` [PATCH net-next 0/2] tipc: do some fixups David Miller
2013-12-25 1:33 ` Wang Weidong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387263827-20876-2-git-send-email-wangweidong1@huawei.com \
--to=wangweidong1@huawei.com \
--cc=David.Laight@ACULAB.COM \
--cc=allan.stephens@windriver.com \
--cc=davem@davemloft.net \
--cc=jon.maloy@ericsson.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).