diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/ipv4/igmp.c | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
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 fbc53767bf35..313ad93d2f7b 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
| @@ -1721,7 +1721,8 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, | |||
| 1721 | if (err) { | 1721 | if (err) { |
| 1722 | int j; | 1722 | int j; |
| 1723 | 1723 | ||
| 1724 | pmc->sfcount[sfmode]--; | 1724 | if (!delta) |
| 1725 | pmc->sfcount[sfmode]--; | ||
| 1725 | for (j=0; j<i; j++) | 1726 | for (j=0; j<i; j++) |
| 1726 | (void) ip_mc_del1_src(pmc, sfmode, &psfsrc[j]); | 1727 | (void) ip_mc_del1_src(pmc, sfmode, &psfsrc[j]); |
| 1727 | } else if (isexclude != (pmc->sfcount[MCAST_EXCLUDE] != 0)) { | 1728 | } else if (isexclude != (pmc->sfcount[MCAST_EXCLUDE] != 0)) { |