From patchwork Wed May 1 17:49:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 240794 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 A2C312C00D2 for ; Thu, 2 May 2013 03:49:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754814Ab3EARtk (ORCPT ); Wed, 1 May 2013 13:49:40 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:58533 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201Ab3EARtd (ORCPT ); Wed, 1 May 2013 13:49:33 -0400 Received: from frodo.de.keymile.net ([10.9.1.54]:56923 helo=mailrelay.de.keymile.net) by mail-de.keymile.com with esmtp (Exim 4.76) (envelope-from ) id 1UXb9c-00028j-0E; Wed, 01 May 2013 19:49:20 +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 r41HlPxe021857; Wed, 1 May 2013 19:47:27 +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 v4 2/3] tipc: tipc_bcbearer_send(): simplify bearer selection Date: Wed, 1 May 2013 19:49:16 +0200 Message-Id: <1367430557-11843-2-git-send-email-gerlando.falauto@keymile.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1367430557-11843-1-git-send-email-gerlando.falauto@keymile.com> References: <1367430557-11843-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 v3: NONE 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) {