summary refs log tree commit diff
path: root/net
diff options
context:
space:
mode:
authorRongQing.Li <roy.qing.li@gmail.com>2012-04-04 16:47:04 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-05 00:00:42 -0400
commit78d50217baf36093ab320f95bae0d6452daec85c (patch)
treeca39d544f4e2918ade64f0a601ebd6b41cc808f0 /net
parent117980c4c994b6fe58e873fe803c9bcdcb4337a3 (diff)
downloadlinux-78d50217baf36093ab320f95bae0d6452daec85c.tar.gz
ipv6: fix array index in ip6_mc_add_src()
Convert array index from the loop bound to the loop index.

And remove the void type conversion to ip6_mc_del1_src() return
code, seem it is unnecessary, since ip6_mc_del1_src() does not
use __must_check similar attribute, no compiler will report the
warning when it is removed.

v2: enrich the commit header

Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/mcast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 16c33e308121..b2869cab2092 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2044,7 +2044,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
 		if (!delta)
 			pmc->mca_sfcount[sfmode]--;
 		for (j=0; j<i; j++)
-			(void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
+			ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
 	} else if (isexclude != (pmc->mca_sfcount[MCAST_EXCLUDE] != 0)) {
 		struct ip6_sf_list *psf;