summaryrefslogtreecommitdiffstats
path: root/net/tipc/net.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/net.c
parentd1bcb11544109114d72965afea7805cc3e16a83a (diff)
downloadtalos-op-linux-f831c963b5c20bec230edce89e25f369996be5db.tar.gz
talos-op-linux-f831c963b5c20bec230edce89e25f369996be5db.zip
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/net.c')
-rw-r--r--net/tipc/net.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index f6303d79f7f5..b5b337f5516d 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -114,8 +114,7 @@ atomic_t tipc_num_links;
static int net_start(void)
{
- tipc_nodes = kcalloc(tipc_max_nodes + 1,
- sizeof(*tipc_nodes), GFP_ATOMIC);
+ tipc_nodes = kcalloc(4096, sizeof(*tipc_nodes), GFP_ATOMIC);
tipc_highest_node = 0;
atomic_set(&tipc_num_links, 0);
OpenPOWER on IntegriCloud