aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2010-12-31 13:59:16 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-01 16:57:47 -0500
commit51f98a8d70583b18cb08b19353aeed5efb0244af (patch)
tree96253d3cb394202b442e65f4d169bbf49b94c327 /net/tipc/core.c
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/core.c')
-rw-r--r--net/tipc/core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index f5d62c174de2..13946331bd4d 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -48,10 +48,6 @@
48#include "config.h" 48#include "config.h"
49 49
50 50
51#ifndef CONFIG_TIPC_ZONES
52#define CONFIG_TIPC_ZONES 3
53#endif
54
55#ifndef CONFIG_TIPC_CLUSTERS 51#ifndef CONFIG_TIPC_CLUSTERS
56#define CONFIG_TIPC_CLUSTERS 1 52#define CONFIG_TIPC_CLUSTERS 1
57#endif 53#endif
@@ -84,7 +80,6 @@ const char tipc_alphabet[] =
84/* configurable TIPC parameters */ 80/* configurable TIPC parameters */
85 81
86u32 tipc_own_addr; 82u32 tipc_own_addr;
87int tipc_max_zones;
88int tipc_max_clusters; 83int tipc_max_clusters;
89int tipc_max_nodes; 84int tipc_max_nodes;
90int tipc_max_slaves; 85int tipc_max_slaves;
@@ -209,7 +204,6 @@ static int __init tipc_init(void)
209 tipc_max_publications = 10000; 204 tipc_max_publications = 10000;
210 tipc_max_subscriptions = 2000; 205 tipc_max_subscriptions = 2000;
211 tipc_max_ports = CONFIG_TIPC_PORTS; 206 tipc_max_ports = CONFIG_TIPC_PORTS;
212 tipc_max_zones = CONFIG_TIPC_ZONES;
213 tipc_max_clusters = CONFIG_TIPC_CLUSTERS; 207 tipc_max_clusters = CONFIG_TIPC_CLUSTERS;
214 tipc_max_nodes = CONFIG_TIPC_NODES; 208 tipc_max_nodes = CONFIG_TIPC_NODES;
215 tipc_max_slaves = CONFIG_TIPC_SLAVE_NODES; 209 tipc_max_slaves = CONFIG_TIPC_SLAVE_NODES;