diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 11:53:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 11:53:45 +0100 |
commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /net/ipv6/mcast.c | |
parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
download | op-kernel-dev-1eecb8280b038019f2f914abc01b28caf5d0a168.zip op-kernel-dev-1eecb8280b038019f2f914abc01b28caf5d0a168.tar.gz |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'net/ipv6/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 16c33e3..b2869ca 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; |