aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerlando Falauto <gerlando.falauto@keymile.com>2013-05-01 08:04:45 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-03 16:08:58 -0400
commit77861d9c00900c0105b9d66ecf9fa612a43f8df5 (patch)
treef08234774c2d6aa579b3de70c0ff3d8b630f1186
parente616071094c214a274fb66d0b297f8b25a1a34d7 (diff)
tipc: tipc_bcbearer_send(): simplify bearer selection
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/bcast.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 0e2f4324f542..d9d848d488ee 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -610,23 +610,23 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
610 for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) { 610 for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) {
611 struct tipc_bearer *p = bcbearer->bpairs[bp_index].primary; 611 struct tipc_bearer *p = bcbearer->bpairs[bp_index].primary;
612 struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary; 612 struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary;
613 struct tipc_bearer *b = p;
613 614
614 if (!p) 615 if (!p)
615 break; /* No more bearers to try */ 616 break; /* No more bearers to try */
616 617
617 tipc_nmap_diff(&bcbearer->remains, &p->nodes, 618 if (tipc_bearer_blocked(p)) {
619 if (!s || tipc_bearer_blocked(s))
620 continue; /* Can't use either bearer */
621 b = s;
622 }
623
624 tipc_nmap_diff(&bcbearer->remains, &b->nodes,
618 &bcbearer->remains_new); 625 &bcbearer->remains_new);
619 if (bcbearer->remains_new.count == bcbearer->remains.count) 626 if (bcbearer->remains_new.count == bcbearer->remains.count)
620 continue; /* Nothing added by bearer pair */ 627 continue; /* Nothing added by bearer pair */
621 628
622 if (!tipc_bearer_blocked(p)) 629 tipc_bearer_send(b, buf, &b->bcast_addr);
623 tipc_bearer_send(p, buf, &p->bcast_addr);
624 else if (s && !tipc_bearer_blocked(s))
625 /* unable to send on primary bearer */
626 tipc_bearer_send(s, buf, &s->bcast_addr);
627 else
628 /* unable to send on either bearer */
629 continue;
630 630
631 /* Swap bearers for next packet */ 631 /* Swap bearers for next packet */
632 if (s) { 632 if (s) {