summaryrefslogtreecommitdiffstats
path: root/net/tipc/port.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/port.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/port.h')
-rw-r--r--net/tipc/port.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/port.h b/net/tipc/port.h
index e5f8c16..ff31ee4 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -105,7 +105,7 @@ struct port {
u32 probing_interval;
u32 last_in_seqno;
struct timer_list timer;
- struct node_subscr subscription;
+ struct tipc_node_subscr subscription;
};
extern spinlock_t tipc_port_list_lock;
OpenPOWER on IntegriCloud