diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
tree | 437d685035c2a39395f14c233831422ed636c016 /net/ipv4/igmp.c | |
parent | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (diff) | |
parent | db33f4de9952af112b0d4f2436ce931ae632aba0 (diff) |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index c7472eff2d5..b2ca095cb9d 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1716,7 +1716,8 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, if (err) { int j; - pmc->sfcount[sfmode]--; + if (!delta) + pmc->sfcount[sfmode]--; for (j=0; j<i; j++) (void) ip_mc_del1_src(pmc, sfmode, &psfsrc[j]); } else if (isexclude != (pmc->sfcount[MCAST_EXCLUDE] != 0)) { |