diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 13:59:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-01 16:57:49 -0500 |
commit | 8f92df6ad49da958d97e171762d0a97a3dc738f1 (patch) | |
tree | ad848109f978d225b42ea219d7f45f10aa008a2c /net/tipc/core.c | |
parent | 51a8e4dee7653698ba4c6e7de71053665f075273 (diff) |
tipc: Remove prototype code for supporting multiple clusters
Eliminates routines, data structures, and files that were intended
to allow TIPC to support a network containing multiple clusters.
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.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 8b7af893971..b9a3ef13f7e 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_CLUSTERS | ||
52 | #define CONFIG_TIPC_CLUSTERS 1 | ||
53 | #endif | ||
54 | |||
55 | #ifndef CONFIG_TIPC_NODES | 51 | #ifndef CONFIG_TIPC_NODES |
56 | #define CONFIG_TIPC_NODES 255 | 52 | #define CONFIG_TIPC_NODES 255 |
57 | #endif | 53 | #endif |
@@ -76,7 +72,6 @@ const char tipc_alphabet[] = | |||
76 | /* configurable TIPC parameters */ | 72 | /* configurable TIPC parameters */ |
77 | 73 | ||
78 | u32 tipc_own_addr; | 74 | u32 tipc_own_addr; |
79 | int tipc_max_clusters; | ||
80 | int tipc_max_nodes; | 75 | int tipc_max_nodes; |
81 | int tipc_max_ports; | 76 | int tipc_max_ports; |
82 | int tipc_max_subscriptions; | 77 | int tipc_max_subscriptions; |
@@ -199,7 +194,6 @@ static int __init tipc_init(void) | |||
199 | tipc_max_publications = 10000; | 194 | tipc_max_publications = 10000; |
200 | tipc_max_subscriptions = 2000; | 195 | tipc_max_subscriptions = 2000; |
201 | tipc_max_ports = CONFIG_TIPC_PORTS; | 196 | tipc_max_ports = CONFIG_TIPC_PORTS; |
202 | tipc_max_clusters = CONFIG_TIPC_CLUSTERS; | ||
203 | tipc_max_nodes = CONFIG_TIPC_NODES; | 197 | tipc_max_nodes = CONFIG_TIPC_NODES; |
204 | tipc_net_id = 4711; | 198 | tipc_net_id = 4711; |
205 | 199 | ||