From 73481cede6fe2a6c7714555371d6ad109aec5a0c Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 17 Aug 2010 11:00:12 +0000 Subject: [PATCH] --- yaml --- r: 213827 b: refs/heads/master c: 76ae0d71d839b365faa7fdca0eec85a6d1a20d95 h: refs/heads/master i: 213825: 833fe96bca25772e41b7e21117225c1c9d5a23ab 213823: 074bdce7e4c33c6c63d931e604d95ac9b05a1e96 v: v3 --- [refs] | 2 +- trunk/net/tipc/node.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1d201eafa7a..8764dfe1b813 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96d841b7038b8091af3530a008793f5577337d3a +refs/heads/master: 76ae0d71d839b365faa7fdca0eec85a6d1a20d95 diff --git a/trunk/net/tipc/node.c b/trunk/net/tipc/node.c index b634942caba5..940851797615 100644 --- a/trunk/net/tipc/node.c +++ b/trunk/net/tipc/node.c @@ -237,8 +237,7 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr) int tipc_node_has_active_links(struct tipc_node *n_ptr) { - return (n_ptr && - ((n_ptr->active_links[0]) || (n_ptr->active_links[1]))); + return n_ptr->active_links[0] != NULL; } int tipc_node_has_redundant_links(struct tipc_node *n_ptr)