summaryrefslogtreecommitdiffstats
path: root/net/tipc/zone.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-02 23:38:32 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-02 23:38:32 -0700
commit6c00055a819ce8a6e2c3af2f65d4ea1a8559c491 (patch)
tree10a99e61740723be45ba056b2edd623d237c0207 /net/tipc/zone.h
parent37b08e34a98c664bea86e3fae718ac45a46b7276 (diff)
downloadop-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/zone.h')
-rw-r--r--net/tipc/zone.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/zone.h b/net/tipc/zone.h
index 6e7a08d..7bdc340 100644
--- a/net/tipc/zone.h
+++ b/net/tipc/zone.h
@@ -54,7 +54,7 @@ struct _zone {
u32 links;
};
-struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref);
+struct tipc_node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref);
u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref);
void tipc_zone_remove_as_router(struct _zone *z_ptr, u32 router);
void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest);
OpenPOWER on IntegriCloud