summary refs log tree commit diff
path: root/net/core/dev_mcast.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-11-10 21:36:04 -0800
committerDavid S. Miller <davem@davemloft.net>2007-11-10 21:36:04 -0800
commite9671fcb3bef1fe2e71aa0456bd5b7eec9e8de4d (patch)
treea90b0faa96659acb47468cba910311e370158980 /net/core/dev_mcast.c
parent03f49f345749abc08bc84b835433c94eea6e972b (diff)
downloadlinux-e9671fcb3bef1fe2e71aa0456bd5b7eec9e8de4d.tar.gz
[NET]: Fix infinite loop in dev_mc_unsync().
From: Joe Perches <joe@perches.com>

Based upon an initial patch and report by Luis R. Rodriguez.

Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev_mcast.c')
-rw-r--r--net/core/dev_mcast.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index ae354057d84c..647973daca2b 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -168,13 +168,13 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
 	da = from->mc_list;
 	while (da != NULL) {
 		next = da->next;
-		if (!da->da_synced)
-			continue;
-		__dev_addr_delete(&to->mc_list, &to->mc_count,
-				  da->da_addr, da->da_addrlen, 0);
-		da->da_synced = 0;
-		__dev_addr_delete(&from->mc_list, &from->mc_count,
-				  da->da_addr, da->da_addrlen, 0);
+		if (da->da_synced) {
+			__dev_addr_delete(&to->mc_list, &to->mc_count,
+					  da->da_addr, da->da_addrlen, 0);
+			da->da_synced = 0;
+			__dev_addr_delete(&from->mc_list, &from->mc_count,
+					  da->da_addr, da->da_addrlen, 0);
+		}
 		da = next;
 	}
 	__dev_set_rx_mode(to);