From patchwork Wed May 1 16:41:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 240789 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 48E1C2C00D2 for ; Thu, 2 May 2013 02:48:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751236Ab3EAQsC (ORCPT ); Wed, 1 May 2013 12:48:02 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:55774 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750976Ab3EAQsB (ORCPT ); Wed, 1 May 2013 12:48:01 -0400 X-Greylist: delayed 375 seconds by postgrey-1.27 at vger.kernel.org; Wed, 01 May 2013 12:48:00 EDT Received: from frodo.de.keymile.net ([10.9.1.54]:56653 helo=mailrelay.de.keymile.net) by mail-de.keymile.com with esmtp (Exim 4.76) (envelope-from ) id 1UXa63-00060C-1V; Wed, 01 May 2013 18:41:35 +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 r41Gdexd021502; Wed, 1 May 2013 18:39:40 +0200 (MEST) From: Gerlando Falauto To: netdev@vger.kernel.org, sergei.shtylyov@cogentembedded.com Cc: jon.maloy@ericsson.com, erik.hugne@ericsson.com, ying.xue@windriver.com, holger.brunck@keymile.com, Gerlando Falauto Subject: [PATCH v3b 1/3] tipc: cosmetic: clean up comments and break a long line Date: Wed, 1 May 2013 18:41:17 +0200 Message-Id: <1367426477-10441-1-git-send-email-gerlando.falauto@keymile.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <51814058.3080805@cogentembedded.com> References: <51814058.3080805@cogentembedded.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: * Added "and break a long line" to the commit message Changes from v2: * Split cosmetic (this patch) from functional changes (next patch) net/tipc/bcast.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 2655c9f..8438e01 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -584,8 +584,7 @@ static int tipc_bcbearer_send(struct sk_buff *buf, { int bp_index; - /* - * Prepare broadcast link message for reliable transmission, + /* Prepare broadcast link message for reliable transmission, * if first time trying to send it; * preparation is skipped for broadcast link protocol messages * 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, struct tipc_bearer *s = bcbearer->bpairs[bp_index].secondary; if (!p) - break; /* no more bearers to try */ + break; /* No more bearers to try */ - tipc_nmap_diff(&bcbearer->remains, &p->nodes, &bcbearer->remains_new); + tipc_nmap_diff(&bcbearer->remains, &p->nodes, + &bcbearer->remains_new); if (bcbearer->remains_new.count == bcbearer->remains.count) - continue; /* bearer pair doesn't add anything */ + continue; /* Nothing added by bearer pair */ if (!tipc_bearer_blocked(p)) tipc_bearer_send(p, buf, &p->media->bcast_addr); @@ -628,13 +628,14 @@ static int tipc_bcbearer_send(struct sk_buff *buf, /* unable to send on either bearer */ continue; + /* Swap bearers for next packet */ if (s) { bcbearer->bpairs[bp_index].primary = s; bcbearer->bpairs[bp_index].secondary = p; } if (bcbearer->remains_new.count == 0) - break; /* all targets reached */ + break; /* All targets reached */ bcbearer->remains = bcbearer->remains_new; }