aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/cluster.h
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/cluster.h
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/cluster.h')
-rw-r--r--net/tipc/cluster.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/tipc/cluster.h b/net/tipc/cluster.h
index 21493f7beb95..aa1fd6ab4d11 100644
--- a/net/tipc/cluster.h
+++ b/net/tipc/cluster.h
@@ -40,26 +40,21 @@
40#include "addr.h" 40#include "addr.h"
41#include "net.h" 41#include "net.h"
42 42
43#define LOWEST_SLAVE 2048u
44
45/** 43/**
46 * struct cluster - TIPC cluster structure 44 * struct cluster - TIPC cluster structure
47 * @addr: network address of cluster 45 * @addr: network address of cluster
48 * @nodes: array of pointers to all nodes within cluster 46 * @nodes: array of pointers to all nodes within cluster
49 * @highest_node: id of highest numbered node within cluster 47 * @highest_node: id of highest numbered node within cluster
50 * @highest_slave: (used for secondary node support)
51 */ 48 */
52 49
53struct cluster { 50struct cluster {
54 u32 addr; 51 u32 addr;
55 struct tipc_node **nodes; 52 struct tipc_node **nodes;
56 u32 highest_node; 53 u32 highest_node;
57 u32 highest_slave;
58}; 54};
59 55
60 56
61extern struct tipc_node **tipc_local_nodes; 57extern struct tipc_node **tipc_local_nodes;
62extern u32 tipc_highest_allowed_slave;
63extern struct tipc_node_map tipc_cltr_bcast_nodes; 58extern struct tipc_node_map tipc_cltr_bcast_nodes;
64 59
65void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router); 60void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router);
@@ -70,12 +65,10 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf);
70struct cluster *tipc_cltr_create(u32 addr); 65struct cluster *tipc_cltr_create(u32 addr);
71void tipc_cltr_delete(struct cluster *c_ptr); 66void tipc_cltr_delete(struct cluster *c_ptr);
72void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr); 67void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr);
73void tipc_cltr_send_slave_routes(struct cluster *c_ptr, u32 dest);
74void tipc_cltr_broadcast(struct sk_buff *buf); 68void tipc_cltr_broadcast(struct sk_buff *buf);
75int tipc_cltr_init(void); 69int tipc_cltr_init(void);
76 70
77void tipc_cltr_bcast_new_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi); 71void tipc_cltr_bcast_new_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi);
78void tipc_cltr_send_local_routes(struct cluster *c_ptr, u32 dest);
79void tipc_cltr_bcast_lost_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi); 72void tipc_cltr_bcast_lost_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi);
80 73
81static inline struct cluster *tipc_cltr_find(u32 addr) 74static inline struct cluster *tipc_cltr_find(u32 addr)