diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 18:59:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-01 13:57:48 -0800 |
| commit | 08c80e9a031df0a8f0269477a32f5eae47d7a146 (patch) | |
| tree | 87a20adf19603edfafabc0b138a2992a0cbe6481 /net/tipc/core.c | |
| parent | 51f98a8d70583b18cb08b19353aeed5efb0244af (diff) | |
| download | lwn-08c80e9a031df0a8f0269477a32f5eae47d7a146.tar.gz lwn-08c80e9a031df0a8f0269477a32f5eae47d7a146.zip | |
tipc: Remove prototype code for supporting slave nodes
Simplifies routines and data structures that were intended to allow
TIPC to support slave nodes (i.e. nodes that did not have links to
all of the other nodes in its cluster, forcing TIPC to route messages
that it could not deliver directly through a non-slave node).
Currently, TIPC supports only networks containing non-slave nodes,
so this code is unnecessary.
Note: The latest edition of the TIPC 2.0 Specification has eliminated
the concept of slave nodes entirely.
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 13946331bd4d..8b7af893971e 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -56,10 +56,6 @@ #define CONFIG_TIPC_NODES 255 #endif -#ifndef CONFIG_TIPC_SLAVE_NODES -#define CONFIG_TIPC_SLAVE_NODES 0 -#endif - #ifndef CONFIG_TIPC_PORTS #define CONFIG_TIPC_PORTS 8191 #endif @@ -82,7 +78,6 @@ const char tipc_alphabet[] = u32 tipc_own_addr; int tipc_max_clusters; int tipc_max_nodes; -int tipc_max_slaves; int tipc_max_ports; int tipc_max_subscriptions; int tipc_max_publications; @@ -206,7 +201,6 @@ static int __init tipc_init(void) tipc_max_ports = CONFIG_TIPC_PORTS; tipc_max_clusters = CONFIG_TIPC_CLUSTERS; tipc_max_nodes = CONFIG_TIPC_NODES; - tipc_max_slaves = CONFIG_TIPC_SLAVE_NODES; tipc_net_id = 4711; if ((res = tipc_core_start())) |