diff options
| author | RongQing.Li <roy.qing.li@gmail.com> | 2012-04-04 16:47:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:19 -0700 |
| commit | 93deb00abf9ccfcd66060760df11061cc0b9f030 (patch) | |
| tree | 82ecb493309270fbe212b09a4a6c4d0438eb7f46 | |
| parent | 4baf6fcf14c1c8e228dbf73bc3b5393c80ce6065 (diff) | |
| download | kernel_samsung_aries-93deb00abf9ccfcd66060760df11061cc0b9f030.zip kernel_samsung_aries-93deb00abf9ccfcd66060760df11061cc0b9f030.tar.gz kernel_samsung_aries-93deb00abf9ccfcd66060760df11061cc0b9f030.tar.bz2 | |
ipv6: fix array index in ip6_mc_add_src()
[ Upstream commit 78d50217baf36093ab320f95bae0d6452daec85c ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 2257366..f2d74ea 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -2054,7 +2054,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; |