[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1387263827-20876-2-git-send-email-wangweidong1@huawei.com>
Date: Tue, 17 Dec 2013 15:03:46 +0800
From: Wang Weidong <wangweidong1@...wei.com>
To: <jon.maloy@...csson.com>, <allan.stephens@...driver.com>,
<davem@...emloft.net>
CC: <David.Laight@...LAB.COM>, <netdev@...r.kernel.org>
Subject: [PATCH net-next 1/2] tipc: make the code look more better
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@...LAB.COM>
Signed-off-by: Wang Weidong <wangweidong1@...wei.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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists