aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2010-12-31 13:59:17 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-01 16:57:48 -0500
commit08c80e9a031df0a8f0269477a32f5eae47d7a146 (patch)
tree87a20adf19603edfafabc0b138a2992a0cbe6481 /net/tipc/core.c
parent51f98a8d70583b18cb08b19353aeed5efb0244af (diff)
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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 13946331bd4..8b7af893971 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -56,10 +56,6 @@
56#define CONFIG_TIPC_NODES 255 56#define CONFIG_TIPC_NODES 255
57#endif 57#endif
58 58
59#ifndef CONFIG_TIPC_SLAVE_NODES
60#define CONFIG_TIPC_SLAVE_NODES 0
61#endif
62
63#ifndef CONFIG_TIPC_PORTS 59#ifndef CONFIG_TIPC_PORTS
64#define CONFIG_TIPC_PORTS 8191 60#define CONFIG_TIPC_PORTS 8191
65#endif 61#endif
@@ -82,7 +78,6 @@ const char tipc_alphabet[] =
82u32 tipc_own_addr; 78u32 tipc_own_addr;
83int tipc_max_clusters; 79int tipc_max_clusters;
84int tipc_max_nodes; 80int tipc_max_nodes;
85int tipc_max_slaves;
86int tipc_max_ports; 81int tipc_max_ports;
87int tipc_max_subscriptions; 82int tipc_max_subscriptions;
88int tipc_max_publications; 83int tipc_max_publications;
@@ -206,7 +201,6 @@ static int __init tipc_init(void)
206 tipc_max_ports = CONFIG_TIPC_PORTS; 201 tipc_max_ports = CONFIG_TIPC_PORTS;
207 tipc_max_clusters = CONFIG_TIPC_CLUSTERS; 202 tipc_max_clusters = CONFIG_TIPC_CLUSTERS;
208 tipc_max_nodes = CONFIG_TIPC_NODES; 203 tipc_max_nodes = CONFIG_TIPC_NODES;
209 tipc_max_slaves = CONFIG_TIPC_SLAVE_NODES;
210 tipc_net_id = 4711; 204 tipc_net_id = 4711;
211 205
212 if ((res = tipc_core_start())) 206 if ((res = tipc_core_start()))