aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2014-05-04 20:56:11 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-05 17:26:44 -0400
commit10f465c4966fbc8f50a59480d37a3451f6f3d564 (patch)
treef94a16d100710b23ff3c3069a76bc942f32edc00 /net/tipc/node.c
parent486f930ac546914550b84abbc227867cc1be1f95 (diff)
tipc: rename setup_blocked variable of node struct to flags
Rename setup_blocked variable of node struct to a more common name called "flags", which will be used to represent kinds of node states. Signed-off-by: Ying Xue <ying.xue@windriver.com> Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r--net/tipc/node.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6d6543e88c2c..2b0a0849d4cc 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -108,7 +108,7 @@ struct tipc_node *tipc_node_create(u32 addr)
108 break; 108 break;
109 } 109 }
110 list_add_tail_rcu(&n_ptr->list, &temp_node->list); 110 list_add_tail_rcu(&n_ptr->list, &temp_node->list);
111 n_ptr->block_setup = WAIT_PEER_DOWN; 111 n_ptr->flags = TIPC_NODE_DOWN;
112 n_ptr->signature = INVALID_NODE_SIG; 112 n_ptr->signature = INVALID_NODE_SIG;
113 113
114 tipc_num_nodes++; 114 tipc_num_nodes++;
@@ -280,7 +280,7 @@ static void node_name_purge_complete(unsigned long node_addr)
280 n_ptr = tipc_node_find(node_addr); 280 n_ptr = tipc_node_find(node_addr);
281 if (n_ptr) { 281 if (n_ptr) {
282 tipc_node_lock(n_ptr); 282 tipc_node_lock(n_ptr);
283 n_ptr->block_setup &= ~WAIT_NAMES_GONE; 283 n_ptr->flags &= ~TIPC_NAMES_GONE;
284 tipc_node_unlock(n_ptr); 284 tipc_node_unlock(n_ptr);
285 } 285 }
286} 286}
@@ -324,7 +324,7 @@ static void node_lost_contact(struct tipc_node *n_ptr)
324 tipc_nodesub_notify(n_ptr); 324 tipc_nodesub_notify(n_ptr);
325 325
326 /* Prevent re-contact with node until cleanup is done */ 326 /* Prevent re-contact with node until cleanup is done */
327 n_ptr->block_setup = WAIT_PEER_DOWN | WAIT_NAMES_GONE; 327 n_ptr->flags = TIPC_NODE_DOWN | TIPC_NAMES_GONE;
328 tipc_k_signal((Handler)node_name_purge_complete, n_ptr->addr); 328 tipc_k_signal((Handler)node_name_purge_complete, n_ptr->addr);
329} 329}
330 330