From db6586d77b06bcac7dabce99eadbafb5d10f1d57 Mon Sep 17 00:00:00 2001 From: Michal Ruzicka Date: Tue, 15 Aug 2006 00:20:17 -0700 Subject: [PATCH] --- yaml --- r: 33398 b: refs/heads/master c: bb699cbca0096aa3f5f750264ec0af080732375a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/igmp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7534dc57ca2..1be7fa208408 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 640c41c77a96dbbfb74d40ae86ab75b759afb911 +refs/heads/master: bb699cbca0096aa3f5f750264ec0af080732375a diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c index 9f4b752f5a33..e981369ebe13 100644 --- a/trunk/net/ipv4/igmp.c +++ b/trunk/net/ipv4/igmp.c @@ -2199,13 +2199,13 @@ void ip_mc_drop_socket(struct sock *sk) struct in_device *in_dev; inet->mc_list = iml->next; - if ((in_dev = inetdev_by_index(iml->multi.imr_ifindex)) != NULL) { - (void) ip_mc_leave_src(sk, iml, in_dev); + in_dev = inetdev_by_index(iml->multi.imr_ifindex); + (void) ip_mc_leave_src(sk, iml, in_dev); + if (in_dev != NULL) { ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); in_dev_put(in_dev); } sock_kfree_s(sk, iml, sizeof(*iml)); - } rtnl_unlock(); }