From 673ef0d7596d381dd628204cc770b5d8b55fcb3f Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Sat, 10 Nov 2007 21:36:04 -0800 Subject: [PATCH] --- yaml --- r: 73519 b: refs/heads/master c: e9671fcb3bef1fe2e71aa0456bd5b7eec9e8de4d h: refs/heads/master i: 73517: 19e663ff85ea81cea2b608b86646e1bd7fa5c234 73515: 6239524f0f2c918e99db0e7041b4b83a6af889bf 73511: d3d3b4238e3e7751a60b308bc7e89baca2b86cca 73503: 678e423a2df5decdf47561cbb5820e5270f34420 v: v3 --- [refs] | 2 +- trunk/net/core/dev_mcast.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4b42ae6327b4..02c3ebc6c333 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03f49f345749abc08bc84b835433c94eea6e972b +refs/heads/master: e9671fcb3bef1fe2e71aa0456bd5b7eec9e8de4d diff --git a/trunk/net/core/dev_mcast.c b/trunk/net/core/dev_mcast.c index ae354057d84c..647973daca2b 100644 --- a/trunk/net/core/dev_mcast.c +++ b/trunk/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);