aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGerlando Falauto <gerlando.falauto@keymile.com>2013-05-01 12:04:44 +0000
committerDavid S. Miller <davem@davemloft.net>2013-05-03 16:08:58 -0400
commite616071094c214a274fb66d0b297f8b25a1a34d7 (patch)
tree927027013f5445d55afc67c98bbeb9c832bd5bbf /net
parentdrivers: net: cpsw: irq not disabled in cpsw isr in particular sequence (diff)
downloadlinux-dev-e616071094c214a274fb66d0b297f8b25a1a34d7.tar.xz
linux-dev-e616071094c214a274fb66d0b297f8b25a1a34d7.zip
tipc: cosmetic: clean up comments and break a long line
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-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,
{
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->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;
}