summaryrefslogtreecommitdiff
path: root/net/tipc/node_subscr.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-04 21:04:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-04 21:04:04 +0200
commit8040d77688014987ca5738bf1731db72ab273441 (patch)
tree99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /net/tipc/node_subscr.c
parentfb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff)
parent268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff)
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'net/tipc/node_subscr.c')
-rw-r--r--net/tipc/node_subscr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index 8ecbd0fb6103..19194d476a9e 100644
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
@@ -44,7 +44,7 @@
* tipc_nodesub_subscribe - create "node down" subscription for specified node
*/
-void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr,
+void tipc_nodesub_subscribe(struct tipc_node_subscr *node_sub, u32 addr,
void *usr_handle, net_ev_handler handle_down)
{
if (addr == tipc_own_addr) {
@@ -69,7 +69,7 @@ void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr,
* tipc_nodesub_unsubscribe - cancel "node down" subscription (if any)
*/
-void tipc_nodesub_unsubscribe(struct node_subscr *node_sub)
+void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub)
{
if (!node_sub->node)
return;