diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-02 23:38:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-02 23:38:32 -0700 |
| commit | 6c00055a819ce8a6e2c3af2f65d4ea1a8559c491 (patch) | |
| tree | 10a99e61740723be45ba056b2edd623d237c0207 /net/tipc/node_subscr.c | |
| parent | 37b08e34a98c664bea86e3fae718ac45a46b7276 (diff) | |
| download | op-kernel-dev-6c00055a819ce8a6e2c3af2f65d4ea1a8559c491.zip op-kernel-dev-6c00055a819ce8a6e2c3af2f65d4ea1a8559c491.tar.gz | |
tipc: Don't use structure names which easily globally conflict.
Andrew Morton reported a build failure on sparc32, because TIPC
uses names like "struct node" and there is a like named data
structure defined in linux/node.h
This just regexp replaces "struct node*" to "struct tipc_node*"
to avoid this and any future similar problems.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node_subscr.c')
| -rw-r--r-- | net/tipc/node_subscr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c index 8ecbd0f..19194d4 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; |
