summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2010-08-17 13:00:12 +0200
committerDavid S. Miller <davem@davemloft.net>2010-08-18 02:31:57 +0200
commit76ae0d71d839b365faa7fdca0eec85a6d1a20d95 (patch)
treed312821b3933522f18241eb313302fe8d723780f
parenttipc: Remove per-connection sequence number logic (diff)
downloadlinux-76ae0d71d839b365faa7fdca0eec85a6d1a20d95.tar.xz
linux-76ae0d71d839b365faa7fdca0eec85a6d1a20d95.zip
tipc: Optimize tipc_node_has_active_links()
Eliminate unnecessary checking for null node pointer and redundant check of second active link array entry. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/node.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index b634942caba5..940851797615 100644
--- a/net/tipc/node.c
+++ b/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)