diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 11:57:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 11:57:05 -0800 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /net/ipv4/igmp.c | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
| download | kernel_goldelico_gta04-c25ecd0a21d5e08160cb5cc984f9e2b8ee347443.zip kernel_goldelico_gta04-c25ecd0a21d5e08160cb5cc984f9e2b8ee347443.tar.gz kernel_goldelico_gta04-c25ecd0a21d5e08160cb5cc984f9e2b8ee347443.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 6f49d6c..0f0e0f0 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2307,10 +2307,8 @@ void ip_mc_drop_socket(struct sock *sk) inet->mc_list = iml->next_rcu; in_dev = inetdev_by_index(net, iml->multi.imr_ifindex); (void) ip_mc_leave_src(sk, iml, in_dev); - if (in_dev != NULL) { + if (in_dev != NULL) ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); - in_dev_put(in_dev); - } /* decrease mem now to avoid the memleak warning */ atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); call_rcu(&iml->rcu, ip_mc_socklist_reclaim); |