diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-23 20:13:41 +0100 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 21:35:16 +0100 |
commit | f1379173326de4c745c4f610501486e4f3bd9248 (patch) | |
tree | 80c3fca29ae990040b8812f810ce7bf6665d5059 /net/tipc/node.c | |
parent | tipc: Prevent null pointer error when removing a node subscription (diff) | |
download | linux-f1379173326de4c745c4f610501486e4f3bd9248.tar.xz linux-f1379173326de4c745c4f610501486e4f3bd9248.zip |
tipc: Cosmetic changes to node subscription code
Relocates the code that notifies users of node subscriptions so that
it is adjacent to the rest of the routines that implement TIPC's node
subscription capability. Renames the name table routine that is
invoked by a node subscription to better reflect its purpose and to
be consistent with other, similar name table routines.
These changes are cosmetic in nature, and do not alter the behavior
of TIPC.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 8926caaf1fc5..713ab5d7c54f 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -327,7 +327,6 @@ static void node_cleanup_finished(unsigned long node_addr) static void node_lost_contact(struct tipc_node *n_ptr) { - struct tipc_node_subscr *ns; char addr_string[16]; u32 i; @@ -365,13 +364,7 @@ static void node_lost_contact(struct tipc_node *n_ptr) } /* Notify subscribers */ - list_for_each_entry(ns, &n_ptr->nsub, nodesub_list) { - if (ns->handle_node_down) { - tipc_k_signal((Handler)ns->handle_node_down, - (unsigned long)ns->usr_handle); - ns->handle_node_down = NULL; - } - } + tipc_nodesub_notify(n_ptr); /* Prevent re-contact with node until all cleanup is done */ |