aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/node.h')
-rw-r--r--net/tipc/node.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 7bfaf5e8c20..3abaaa24c77 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -54,8 +54,6 @@
54 * @cleanup_required: non-zero if cleaning up after a prior loss of contact 54 * @cleanup_required: non-zero if cleaning up after a prior loss of contact
55 * @link_cnt: number of links to node 55 * @link_cnt: number of links to node
56 * @permit_changeover: non-zero if node has redundant links to this system 56 * @permit_changeover: non-zero if node has redundant links to this system
57 * @routers: bitmap (used for multicluster communication)
58 * @last_router: (used for multicluster communication)
59 * @bclink: broadcast-related info 57 * @bclink: broadcast-related info
60 * @supported: non-zero if node supports TIPC b'cast capability 58 * @supported: non-zero if node supports TIPC b'cast capability
61 * @acked: sequence # of last outbound b'cast message acknowledged by node 59 * @acked: sequence # of last outbound b'cast message acknowledged by node
@@ -80,8 +78,6 @@ struct tipc_node {
80 int working_links; 78 int working_links;
81 int cleanup_required; 79 int cleanup_required;
82 int permit_changeover; 80 int permit_changeover;
83 u32 routers[512/32];
84 int last_router;
85 struct { 81 struct {
86 int supported; 82 int supported;
87 u32 acked; 83 u32 acked;
@@ -105,11 +101,7 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr);
105void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr); 101void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr);
106int tipc_node_has_active_links(struct tipc_node *n_ptr); 102int tipc_node_has_active_links(struct tipc_node *n_ptr);
107int tipc_node_has_redundant_links(struct tipc_node *n_ptr); 103int tipc_node_has_redundant_links(struct tipc_node *n_ptr);
108u32 tipc_node_select_router(struct tipc_node *n_ptr, u32 ref);
109struct tipc_node *tipc_node_select_next_hop(u32 addr, u32 selector);
110int tipc_node_is_up(struct tipc_node *n_ptr); 104int tipc_node_is_up(struct tipc_node *n_ptr);
111void tipc_node_add_router(struct tipc_node *n_ptr, u32 router);
112void tipc_node_remove_router(struct tipc_node *n_ptr, u32 router);
113struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); 105struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space);
114struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); 106struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space);
115 107
@@ -117,22 +109,9 @@ static inline struct tipc_node *tipc_node_find(u32 addr)
117{ 109{
118 if (likely(in_own_cluster(addr))) 110 if (likely(in_own_cluster(addr)))
119 return tipc_local_nodes[tipc_node(addr)]; 111 return tipc_local_nodes[tipc_node(addr)];
120 else if (tipc_addr_domain_valid(addr)) {
121 struct cluster *c_ptr = tipc_cltr_find(addr);
122
123 if (c_ptr)
124 return c_ptr->nodes[tipc_node(addr)];
125 }
126 return NULL; 112 return NULL;
127} 113}
128 114
129static inline struct tipc_node *tipc_node_select(u32 addr, u32 selector)
130{
131 if (likely(in_own_cluster(addr)))
132 return tipc_local_nodes[tipc_node(addr)];
133 return tipc_node_select_next_hop(addr, selector);
134}
135
136static inline void tipc_node_lock(struct tipc_node *n_ptr) 115static inline void tipc_node_lock(struct tipc_node *n_ptr)
137{ 116{
138 spin_lock_bh(&n_ptr->lock); 117 spin_lock_bh(&n_ptr->lock);