diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 13:59:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-01 16:57:48 -0500 |
commit | 08c80e9a031df0a8f0269477a32f5eae47d7a146 (patch) | |
tree | 87a20adf19603edfafabc0b138a2992a0cbe6481 /net/tipc/discover.c | |
parent | 51f98a8d70583b18cb08b19353aeed5efb0244af (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/discover.c')
-rw-r--r-- | net/tipc/discover.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index f2ce36baf42e..80799f6ba892 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
@@ -149,10 +149,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) | |||
149 | } | 149 | } |
150 | if (!tipc_in_scope(dest, tipc_own_addr)) | 150 | if (!tipc_in_scope(dest, tipc_own_addr)) |
151 | return; | 151 | return; |
152 | if (is_slave(tipc_own_addr) && is_slave(orig)) | ||
153 | return; | ||
154 | if (is_slave(orig) && !in_own_cluster(orig)) | ||
155 | return; | ||
156 | if (in_own_cluster(orig)) { | 152 | if (in_own_cluster(orig)) { |
157 | /* Always accept link here */ | 153 | /* Always accept link here */ |
158 | struct sk_buff *rbuf; | 154 | struct sk_buff *rbuf; |