diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
| commit | 02735a29d8ce882ec698803f064e17888874780c (patch) | |
| tree | 6a4afa3bc8b6d4334df24910a56f77adf126b0c7 /net/ipv4/igmp.c | |
| parent | Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'm... (diff) | |
| parent | Merge branch 'for-arnd-3.3-defconfig' of git://github.com/at91linux/linux-at9... (diff) | |
| download | linux-02735a29d8ce882ec698803f064e17888874780c.tar.xz linux-02735a29d8ce882ec698803f064e17888874780c.zip | |
Merge branch 'at91/defconfig' into next/cleanup
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 c7472eff2d51..b2ca095cb9da 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)) { |