mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From dda800eb86fb88c28f63c0136cc76b1346322feb Mon Sep 17 00:00:00 2001
|
|
From: "RongQing.Li" <roy.qing.li@gmail.com>
|
|
Date: Wed, 4 Apr 2012 16:47:04 +0000
|
|
Subject: [PATCH 063/165] 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: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
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;
|
|
|
|
--
|
|
1.7.7.6
|
|
|