aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2011-02-25 14:22:11 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:17 -0400
commitf831c963b5c20bec230edce89e25f369996be5db (patch)
tree8024a1771fae59bddaa8f83c025ea9d5d9743f59 /net/tipc/core.c
parentd1bcb11544109114d72965afea7805cc3e16a83a (diff)
tipc: Eliminate configuration for maximum number of cluster nodes
Gets rid of the need for users to specify the maximum number of cluster nodes supported by TIPC. TIPC now automatically provides support for all 4K nodes allowed by its addressing scheme. Note: This change sets TIPC's memory usage to the amount used by a maximum size node table with 4K entries. An upcoming patch that converts the node table from a linear array to a hash table will compact the node table to a more efficient design, but for clarity it is nice to have all the Kconfig infrastruture go away separately. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
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 2da1fc75ad6..c9a73e7763f 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -41,10 +41,6 @@
41#include "config.h" 41#include "config.h"
42 42
43 43
44#ifndef CONFIG_TIPC_NODES
45#define CONFIG_TIPC_NODES 255
46#endif
47
48#ifndef CONFIG_TIPC_PORTS 44#ifndef CONFIG_TIPC_PORTS
49#define CONFIG_TIPC_PORTS 8191 45#define CONFIG_TIPC_PORTS 8191
50#endif 46#endif
@@ -64,7 +60,6 @@ const char tipc_alphabet[] =
64/* configurable TIPC parameters */ 60/* configurable TIPC parameters */
65 61
66u32 tipc_own_addr; 62u32 tipc_own_addr;
67int tipc_max_nodes;
68int tipc_max_ports; 63int tipc_max_ports;
69int tipc_max_subscriptions; 64int tipc_max_subscriptions;
70int tipc_max_publications; 65int tipc_max_publications;
@@ -192,7 +187,6 @@ static int __init tipc_init(void)
192 tipc_max_publications = 10000; 187 tipc_max_publications = 10000;
193 tipc_max_subscriptions = 2000; 188 tipc_max_subscriptions = 2000;
194 tipc_max_ports = CONFIG_TIPC_PORTS; 189 tipc_max_ports = CONFIG_TIPC_PORTS;
195 tipc_max_nodes = CONFIG_TIPC_NODES;
196 tipc_net_id = 4711; 190 tipc_net_id = 4711;
197 191
198 res = tipc_core_start(); 192 res = tipc_core_start();