mcast: do not check 'rv' twice in a row
authorJean Sacren <sakiwit@gmail.com>
Sun, 3 Feb 2013 21:34:10 +0000 (21:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Feb 2013 18:26:49 +0000 (13:26 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/mcast.c

index 8460a1f..e5de485 100644 (file)
@@ -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;