From 4e7b7d57f6d8e829826a97e446a03d1dfa3c87de Mon Sep 17 00:00:00 2001 From: Jean Sacren Date: Sun, 3 Feb 2013 21:34:10 +0000 Subject: [PATCH] --- yaml --- r: 352066 b: refs/heads/master c: 56db1c5f41c2ed0300ca570fea279a7c189c18fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/mcast.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index adbe83887f54..1db980a14488 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25cc4ae913a46bcc11b03c37bec59568f2122a36 +refs/heads/master: 56db1c5f41c2ed0300ca570fea279a7c189c18fb diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c index 8460a1f54a76..e5de48551864 100644 --- a/trunk/net/ipv6/mcast.c +++ b/trunk/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; isl_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;