aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-04-07 13:05:25 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-09-01 11:16:36 -0400
commit169073db442cb9e5aa2b70a2e4158d4f35a3b810 (patch)
tree7ba297dce61f7374d0199e193d577903b0798771 /net/tipc
parentc5bd4d85d356199ebdbc2c8bbfff86a292c65a9f (diff)
tipc: Prevent broadcast link stalling when another node fails
Ensure that broadcast link messages that have not been acknowledged by a newly failed node do not get an implied acknowledgement until the failed node is removed from the broadcast link's map of reachable nodes. Previously, a race condition allowed a new broadcast link message to be sent after the implicit acknowledgement processing was completed, but before the map of reachable nodes was updated, resulting in the message having an expected acknowledgement count that required the failed node to explicitly acknowledge the message. Since this would never occur the new message would remain in the broadcast link's transmit queue forever, eventually causing the link to become congested and "stall". Delaying the implicit acknowledgement processing until after the update of the map of reachable nodes eliminates this race condition and prevents stalling. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/node.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 810b39545264..d75432f5e726 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -349,9 +349,9 @@ static void node_lost_contact(struct tipc_node *n_ptr)
349 n_ptr->bclink.defragm = NULL; 349 n_ptr->bclink.defragm = NULL;
350 } 350 }
351 351
352 tipc_nmap_remove(&tipc_bcast_nmap, n_ptr->addr);
352 tipc_bclink_acknowledge(n_ptr, 353 tipc_bclink_acknowledge(n_ptr,
353 mod(n_ptr->bclink.acked + 10000)); 354 mod(n_ptr->bclink.acked + 10000));
354 tipc_nmap_remove(&tipc_bcast_nmap, n_ptr->addr);
355 if (n_ptr->addr < tipc_own_addr) 355 if (n_ptr->addr < tipc_own_addr)
356 tipc_own_tag--; 356 tipc_own_tag--;
357 357