From patchwork Tue Apr 30 07:33:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 240575 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44A2E2C00BC for ; Tue, 30 Apr 2013 17:39:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757761Ab3D3HjC (ORCPT ); Tue, 30 Apr 2013 03:39:02 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:56047 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753162Ab3D3HjB (ORCPT ); Tue, 30 Apr 2013 03:39:01 -0400 X-Greylist: delayed 327 seconds by postgrey-1.27 at vger.kernel.org; Tue, 30 Apr 2013 03:39:01 EDT Received: from frodo.de.keymile.net ([10.9.1.54]:38431 helo=mailrelay.de.keymile.net) by mail-de.keymile.com with esmtp (Exim 4.76) (envelope-from ) id 1UX545-00035C-32; Tue, 30 Apr 2013 09:33:29 +0200 Received: from chber1-10555x.ch.keymile.net ([172.31.40.82]) by mailrelay.de.keymile.net (8.12.2/8.12.2) with ESMTP id r3U7VYxe025823; Tue, 30 Apr 2013 09:31:37 +0200 (MEST) From: Gerlando Falauto To: netdev@vger.kernel.org Cc: jon.maloy@ericsson.com, erik.hugne@ericsson.com, ying.xue@windriver.com, holger.brunck@keymile.com, Gerlando Falauto Subject: [PATCH v3 2/3] tipc: tipc_bcbearer_send(): simplify bearer selection Date: Tue, 30 Apr 2013 09:33:18 +0200 Message-Id: <1367307199-10577-2-git-send-email-gerlando.falauto@keymile.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1367307199-10577-1-git-send-email-gerlando.falauto@keymile.com> References: <1367244820-29881-1-git-send-email-gerlando.falauto@keymile.com> <1367307199-10577-1-git-send-email-gerlando.falauto@keymile.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Gerlando Falauto --- Changes from v2: * Fixed non-bisectability; was tipc_bearer_send(b, buf, &s->media...) net/tipc/bcast.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 8438e01..c8f572f 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -610,23 +610,23 @@ static int tipc_bcbearer_send(struct sk_buff *buf, for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) { struct tipc_bearer *p = bcbearer->bpairs[bp_index].primary; struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary; + struct tipc_bearer *b = p; if (!p) break; /* No more bearers to try */ - tipc_nmap_diff(&bcbearer->remains, &p->nodes, + if (tipc_bearer_blocked(p)) { + if (!s || tipc_bearer_blocked(s)) + continue; /* Can't use either bearer */ + b = s; + } + + tipc_nmap_diff(&bcbearer->remains, &b->nodes, &bcbearer->remains_new); if (bcbearer->remains_new.count == bcbearer->remains.count) continue; /* Nothing added by bearer pair */ - if (!tipc_bearer_blocked(p)) - tipc_bearer_send(p, buf, &p->media->bcast_addr); - else if (s && !tipc_bearer_blocked(s)) - /* unable to send on primary bearer */ - tipc_bearer_send(s, buf, &s->media->bcast_addr); - else - /* unable to send on either bearer */ - continue; + tipc_bearer_send(b, buf, &b->media->bcast_addr); /* Swap bearers for next packet */ if (s) {