aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2014-05-04 20:56:13 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-05 17:26:44 -0400
commit9d561949685749be3d97239eab7d85aa78718108 (patch)
treee82cd8f0140c9482e3b2e408e18afc6d12fd240a /net/tipc/node.h
parent9db9fdd1983eb960182d72f95d77b91b3a5173d0 (diff)
tipc: remove TIPC_NAMES_GONE node flag
Since previously what all publications pertaining to the lost node were removed from name table was finished in tasklet context asynchronously, we need to TIPC_NAMES_GONE flag indicating whether the node cleanup work is finished or not. But now as the cleanup work has been finished when node lock is released, the flag becomes meaningless for us. 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.h')
-rw-r--r--net/tipc/node.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h
index fd86726ed192..4bd5eff82ce0 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -49,16 +49,14 @@
49 49
50/* Flags used to block (re)establishment of contact with a neighboring node 50/* Flags used to block (re)establishment of contact with a neighboring node
51 * TIPC_NODE_DOWN: indicate node is down 51 * TIPC_NODE_DOWN: indicate node is down
52 * TIPC_NAMES_GONE: indicate the node's publications are purged
53 * TIPC_NODE_RESET: indicate node is reset 52 * TIPC_NODE_RESET: indicate node is reset
54 * TIPC_NODE_LOST: indicate node is lost and it's used to notify subscriptions 53 * TIPC_NODE_LOST: indicate node is lost and it's used to notify subscriptions
55 * when node lock is released 54 * when node lock is released
56 */ 55 */
57enum { 56enum {
58 TIPC_NODE_DOWN = (1 << 1), 57 TIPC_NODE_DOWN = (1 << 1),
59 TIPC_NAMES_GONE = (1 << 2), 58 TIPC_NODE_RESET = (1 << 2),
60 TIPC_NODE_RESET = (1 << 3), 59 TIPC_NODE_LOST = (1 << 3)
61 TIPC_NODE_LOST = (1 << 4)
62}; 60};
63 61
64/** 62/**
@@ -142,7 +140,7 @@ static inline void tipc_node_lock(struct tipc_node *node)
142 140
143static inline bool tipc_node_blocked(struct tipc_node *node) 141static inline bool tipc_node_blocked(struct tipc_node *node)
144{ 142{
145 return (node->flags & (TIPC_NODE_DOWN | TIPC_NAMES_GONE | 143 return (node->flags & (TIPC_NODE_DOWN | TIPC_NODE_LOST |
146 TIPC_NODE_RESET)); 144 TIPC_NODE_RESET));
147} 145}
148 146