aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.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/bearer.h
parent37b08e34a98c664bea86e3fae718ac45a46b7276 (diff)
downloadkernel_goldelico_gta04-6c00055a819ce8a6e2c3af2f65d4ea1a8559c491.zip
kernel_goldelico_gta04-6c00055a819ce8a6e2c3af2f65d4ea1a8559c491.tar.gz
kernel_goldelico_gta04-6c00055a819ce8a6e2c3af2f65d4ea1a8559c491.tar.bz2
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/bearer.h')
-rw-r--r--net/tipc/bearer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 6a36b66..ca57348 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -104,7 +104,7 @@ struct bearer {
u32 continue_count;
int active;
char net_plane;
- struct node_map nodes;
+ struct tipc_node_map nodes;
};
struct bearer_name {