aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/tipc/bcast.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 25e159c2feb4..0e2f4324f542 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -584,8 +584,7 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
584{ 584{
585 int bp_index; 585 int bp_index;
586 586
587 /* 587 /* Prepare broadcast link message for reliable transmission,
588 * Prepare broadcast link message for reliable transmission,
589 * if first time trying to send it; 588 * if first time trying to send it;
590 * preparation is skipped for broadcast link protocol messages 589 * preparation is skipped for broadcast link protocol messages
591 * since they are sent in an unreliable manner and don't need it 590 * since they are sent in an unreliable manner and don't need it
@@ -613,11 +612,12 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
613 struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary; 612 struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary;
614 613
615 if (!p) 614 if (!p)
616 break; /* no more bearers to try */ 615 break; /* No more bearers to try */
617 616
618 tipc_nmap_diff(&bcbearer->remains, &p->nodes, &bcbearer->remains_new); 617 tipc_nmap_diff(&bcbearer->remains, &p->nodes,
618 &bcbearer->remains_new);
619 if (bcbearer->remains_new.count == bcbearer->remains.count) 619 if (bcbearer->remains_new.count == bcbearer->remains.count)
620 continue; /* bearer pair doesn't add anything */ 620 continue; /* Nothing added by bearer pair */
621 621
622 if (!tipc_bearer_blocked(p)) 622 if (!tipc_bearer_blocked(p))
623 tipc_bearer_send(p, buf, &p->bcast_addr); 623 tipc_bearer_send(p, buf, &p->bcast_addr);
@@ -628,13 +628,14 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
628 /* unable to send on either bearer */ 628 /* unable to send on either bearer */
629 continue; 629 continue;
630 630
631 /* Swap bearers for next packet */
631 if (s) { 632 if (s) {
632 bcbearer->bpairs[bp_index].primary = s; 633 bcbearer->bpairs[bp_index].primary = s;
633 bcbearer->bpairs[bp_index].secondary = p; 634 bcbearer->bpairs[bp_index].secondary = p;
634 } 635 }
635 636
636 if (bcbearer->remains_new.count == 0) 637 if (bcbearer->remains_new.count == 0)
637 break; /* all targets reached */ 638 break; /* All targets reached */
638 639
639 bcbearer->remains = bcbearer->remains_new; 640 bcbearer->remains = bcbearer->remains_new;
640 } 641 }