diff options
| author | Allan Stephens | 2011-10-24 21:26:24 +0200 |
|---|---|---|
| committer | Paul Gortmaker | 2011-12-27 17:33:53 +0100 |
| commit | 3655959143ebf1fd32e28a448d204be2f7f13e99 (patch) | |
| tree | 441e42f4e55fedf7d262a3d43ba356a1598f36c5 /net/tipc/link.c | |
| parent | tipc: Flush unsent broadcast messages when contact with last node is lost (diff) | |
| download | kernel-qcow2-linux-3655959143ebf1fd32e28a448d204be2f7f13e99.tar.gz kernel-qcow2-linux-3655959143ebf1fd32e28a448d204be2f7f13e99.tar.xz kernel-qcow2-linux-3655959143ebf1fd32e28a448d204be2f7f13e99.zip | |
tipc: Ignore broadcast acknowledgements that are out-of-range
Adds checks to TIPC's broadcast link so that it ignores any
acknowledgement message containing a sequence number that does not
correspond to an unacknowledged message currently in the broadcast
link's transmit queue.
This change prevents the broadcast link from becoming stalled if a
newly booted node receives stale broadcast link acknowledgement
information from another node that has not yet fully synchronized
its end of the broadcast link to reflect the current state of the
new node's end.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 332915e43043..4eff342326e2 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1733,10 +1733,8 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr) /* Release acked messages */ - if (less(n_ptr->bclink.acked, msg_bcast_ack(msg))) { - if (tipc_node_is_up(n_ptr) && n_ptr->bclink.supported) - tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg)); - } + if (tipc_node_is_up(n_ptr) && n_ptr->bclink.supported) + tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg)); crs = l_ptr->first_out; while ((crs != l_ptr->next_out) && |