diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-23 14:13:41 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:16 -0400 |
commit | f1379173326de4c745c4f610501486e4f3bd9248 (patch) | |
tree | 80c3fca29ae990040b8812f810ce7bf6665d5059 /net/tipc/name_distr.c | |
parent | 431697eb60d2d36614096aff12bd1b826a9f9bc1 (diff) |
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/name_distr.c')
-rw-r--r-- | net/tipc/name_distr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 1d4a18aa9ccc..d58dae78b551 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
@@ -214,7 +214,7 @@ exit: | |||
214 | } | 214 | } |
215 | 215 | ||
216 | /** | 216 | /** |
217 | * node_is_down - remove publication associated with a failed node | 217 | * named_purge_publ - remove publication associated with a failed node |
218 | * | 218 | * |
219 | * Invoked for each publication issued by a newly failed node. | 219 | * Invoked for each publication issued by a newly failed node. |
220 | * Removes publication structure from name table & deletes it. | 220 | * Removes publication structure from name table & deletes it. |
@@ -223,7 +223,7 @@ exit: | |||
223 | * publication. Nudge this item's key to distinguish it from the other. | 223 | * publication. Nudge this item's key to distinguish it from the other. |
224 | */ | 224 | */ |
225 | 225 | ||
226 | static void node_is_down(struct publication *publ) | 226 | static void named_purge_publ(struct publication *publ) |
227 | { | 227 | { |
228 | struct publication *p; | 228 | struct publication *p; |
229 | 229 | ||
@@ -269,7 +269,8 @@ void tipc_named_recv(struct sk_buff *buf) | |||
269 | tipc_nodesub_subscribe(&publ->subscr, | 269 | tipc_nodesub_subscribe(&publ->subscr, |
270 | msg_orignode(msg), | 270 | msg_orignode(msg), |
271 | publ, | 271 | publ, |
272 | (net_ev_handler)node_is_down); | 272 | (net_ev_handler) |
273 | named_purge_publ); | ||
273 | } | 274 | } |
274 | } else if (msg_type(msg) == WITHDRAWAL) { | 275 | } else if (msg_type(msg) == WITHDRAWAL) { |
275 | publ = tipc_nametbl_remove_publ(ntohl(item->type), | 276 | publ = tipc_nametbl_remove_publ(ntohl(item->type), |