diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
| commit | 27b61ae2d73936554fcd07e77c3cc13bc88c41a9 (patch) | |
| tree | 12f589c6a4671bf7f08045bb11059514f47bb924 /net/tipc/core.c | |
| parent | 46af31800b6916c92fffa529dc3c357008da957d (diff) | |
| parent | 633d2bdedc3b81f202bda8fdad17aeb08809b7df (diff) | |
| download | kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.zip kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.gz kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.bz2 | |
Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
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 2da1fc7..c9a73e7 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -41,10 +41,6 @@ #include "config.h" -#ifndef CONFIG_TIPC_NODES -#define CONFIG_TIPC_NODES 255 -#endif - #ifndef CONFIG_TIPC_PORTS #define CONFIG_TIPC_PORTS 8191 #endif @@ -64,7 +60,6 @@ const char tipc_alphabet[] = /* configurable TIPC parameters */ u32 tipc_own_addr; -int tipc_max_nodes; int tipc_max_ports; int tipc_max_subscriptions; int tipc_max_publications; @@ -192,7 +187,6 @@ static int __init tipc_init(void) tipc_max_publications = 10000; tipc_max_subscriptions = 2000; tipc_max_ports = CONFIG_TIPC_PORTS; - tipc_max_nodes = CONFIG_TIPC_NODES; tipc_net_id = 4711; res = tipc_core_start(); |