path: root/net/tipc/cluster.h
diff options
authorAllan Stephens <Allan.Stephens@windriver.com>2010-12-31 18:59:16 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-01 13:57:47 -0800
commit51f98a8d70583b18cb08b19353aeed5efb0244af (patch)
tree96253d3cb394202b442e65f4d169bbf49b94c327 /net/tipc/cluster.h
parentaa6027cacdd912ce884953714fcc7392b6155bc6 (diff)
tipc: Remove prototype code for supporting multiple zones
Eliminates routines, data structures, and files that were intended to allows TIPC to support a network containing multiple zones. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/cluster.h')
1 files changed, 4 insertions, 8 deletions
diff --git a/net/tipc/cluster.h b/net/tipc/cluster.h
index 32636d98c9c..21493f7beb9 100644
--- a/net/tipc/cluster.h
+++ b/net/tipc/cluster.h
@@ -38,14 +38,13 @@
#include "addr.h"
-#include "zone.h"
+#include "net.h"
#define LOWEST_SLAVE 2048u
* struct cluster - TIPC cluster structure
* @addr: network address of cluster
- * @owner: pointer to zone that cluster belongs to
* @nodes: array of pointers to all nodes within cluster
* @highest_node: id of highest numbered node within cluster
* @highest_slave: (used for secondary node support)
@@ -53,7 +52,6 @@
struct cluster {
u32 addr;
- struct _zone *owner;
struct tipc_node **nodes;
u32 highest_node;
u32 highest_slave;
@@ -82,11 +80,9 @@ void tipc_cltr_bcast_lost_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi)
static inline struct cluster *tipc_cltr_find(u32 addr)
- struct _zone *z_ptr = tipc_zone_find(addr);
- if (z_ptr)
- return z_ptr->clusters[1];
- return NULL;
+ if (!in_own_cluster(addr))
+ return NULL;
+ return tipc_net.clusters[1];