[net-next] mcast: do not check 'rv' twice in a row

Submitted by Jean Sacren on Feb. 4, 2013, 7:34 a.m.

Details

Message ID 1359963250-7729-1-git-send-email-sakiwit@gmail.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Jean Sacren Feb. 4, 2013, 7:34 a.m.
With the loop, don't check 'rv' twice in a row. Without the loop, 'rv'
doesn't even need to be checked.

Make the comment more grammar-friendly.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
---
 net/ipv6/mcast.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Feb. 4, 2013, 6:33 p.m.
From: Jean Sacren <sakiwit@gmail.com>
Date: Mon,  4 Feb 2013 00:34:10 -0700

> With the loop, don't check 'rv' twice in a row. Without the loop, 'rv'
> doesn't even need to be checked.
> 
> Make the comment more grammar-friendly.
> 
> Signed-off-by: Jean Sacren <sakiwit@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 8460a1f..e5de4855 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -427,11 +427,9 @@  int ip6_mc_source(int add, int omode, struct sock *sk,
 	rv = 1;	/* > 0 for insert logic below if sl_count is 0 */
 	for (i=0; i<psl->sl_count; i++) {
 		rv = !ipv6_addr_equal(&psl->sl_addr[i], source);
-		if (rv == 0)
-			break;
+		if (rv == 0) /* There is an error in the address. */
+			goto done;
 	}
-	if (rv == 0)		/* address already there is an error */
-		goto done;
 	for (j=psl->sl_count-1; j>=i; j--)
 		psl->sl_addr[j+1] = psl->sl_addr[j];
 	psl->sl_addr[i] = *source;