diff options
Diffstat (limited to 'net/tipc/node_subscr.c')
-rw-r--r-- | net/tipc/node_subscr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c index 79375927916f..afeea121d8be 100644 --- a/net/tipc/node_subscr.c +++ b/net/tipc/node_subscr.c | |||
@@ -41,39 +41,39 @@ | |||
41 | #include "addr.h" | 41 | #include "addr.h" |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * nodesub_subscribe - create "node down" subscription for specified node | 44 | * tipc_nodesub_subscribe - create "node down" subscription for specified node |
45 | */ | 45 | */ |
46 | 46 | ||
47 | void nodesub_subscribe(struct node_subscr *node_sub, u32 addr, | 47 | void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, |
48 | void *usr_handle, net_ev_handler handle_down) | 48 | void *usr_handle, net_ev_handler handle_down) |
49 | { | 49 | { |
50 | node_sub->node = 0; | 50 | node_sub->node = 0; |
51 | if (addr == tipc_own_addr) | 51 | if (addr == tipc_own_addr) |
52 | return; | 52 | return; |
53 | if (!addr_node_valid(addr)) { | 53 | if (!tipc_addr_node_valid(addr)) { |
54 | warn("node_subscr with illegal %x\n", addr); | 54 | warn("node_subscr with illegal %x\n", addr); |
55 | return; | 55 | return; |
56 | } | 56 | } |
57 | 57 | ||
58 | node_sub->handle_node_down = handle_down; | 58 | node_sub->handle_node_down = handle_down; |
59 | node_sub->usr_handle = usr_handle; | 59 | node_sub->usr_handle = usr_handle; |
60 | node_sub->node = node_find(addr); | 60 | node_sub->node = tipc_node_find(addr); |
61 | assert(node_sub->node); | 61 | assert(node_sub->node); |
62 | node_lock(node_sub->node); | 62 | tipc_node_lock(node_sub->node); |
63 | list_add_tail(&node_sub->nodesub_list, &node_sub->node->nsub); | 63 | list_add_tail(&node_sub->nodesub_list, &node_sub->node->nsub); |
64 | node_unlock(node_sub->node); | 64 | tipc_node_unlock(node_sub->node); |
65 | } | 65 | } |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * nodesub_unsubscribe - cancel "node down" subscription (if any) | 68 | * tipc_nodesub_unsubscribe - cancel "node down" subscription (if any) |
69 | */ | 69 | */ |
70 | 70 | ||
71 | void nodesub_unsubscribe(struct node_subscr *node_sub) | 71 | void tipc_nodesub_unsubscribe(struct node_subscr *node_sub) |
72 | { | 72 | { |
73 | if (!node_sub->node) | 73 | if (!node_sub->node) |
74 | return; | 74 | return; |
75 | 75 | ||
76 | node_lock(node_sub->node); | 76 | tipc_node_lock(node_sub->node); |
77 | list_del_init(&node_sub->nodesub_list); | 77 | list_del_init(&node_sub->nodesub_list); |
78 | node_unlock(node_sub->node); | 78 | tipc_node_unlock(node_sub->node); |
79 | } | 79 | } |