Merge nuts.ninka.net:/disk1/davem/BK/network-2.5

into nuts.ninka.net:/disk1/davem/BK/net-2.5

Merge nuts.ninka.net:/disk1/davem/BK/network-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.5
44e2a163 · David S. Miller · c85d8ef9 · 6cb49a2c · 44e2a163
Commit 44e2a163 authored Nov 13, 2003 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/ipv6/mcast.c net/ipv6/mcast.c +1 -1

No files found.
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -664,7 +664,7 @@ static void igmp6_group_dropped(struct ifmcaddr6 *mc)
 		goto done;
 	spin_unlock_bh(&mc->mca_lock);

-	if (dev->flags&IFF_UP)
+	if (!mc->idev->dead)
 		igmp6_leave_group(mc);

 	spin_lock_bh(&mc->mca_lock);