---

yaml --- r: 279104 b: refs/heads/master c: 10745cd h: refs/heads/master v: v3
git-mirror · Dec 27, 2011 · 268102a · 268102a
1 parent 5a46b72
commit 268102a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9157bafb44637a2cfefc222d6551100ead40e79e
+refs/heads/master: 10745cd5990542447268f60078133df8b1ee960b
diff --git a/trunk/net/tipc/bcast.c b/trunk/net/tipc/bcast.c
@@ -252,7 +252,17 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)
 
 	while (crs && less_eq(buf_seqno(crs), acked)) {
 		next = crs->next;
-		bcbuf_decr_acks(crs);
+
+		if (crs != bcl->next_out)
+			bcbuf_decr_acks(crs);
+		else if (bclink->bcast_nodes.count)
+			break;
+		else {
+			bcbuf_set_acks(crs, 0);
+			bcl->next_out = next;
+			bclink_set_last_sent();
+		}
+
 		if (bcbuf_acks(crs) == 0) {
 			bcl->first_out = next;
 			bcl->out_queue_size--;