net: convert multiple drivers to use netdev_for_each_mc_addr, part4
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
7a81e9f3ca
commit
48e2f183cb
@@ -3095,7 +3095,7 @@ static void nv_set_multicast(struct net_device *dev)
|
||||
} else {
|
||||
pff |= NVREG_PFF_MYADDR;
|
||||
|
||||
if (dev->flags & IFF_ALLMULTI || dev->mc_list) {
|
||||
if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev)) {
|
||||
u32 alwaysOff[2];
|
||||
u32 alwaysOn[2];
|
||||
|
||||
@@ -3105,8 +3105,7 @@ static void nv_set_multicast(struct net_device *dev)
|
||||
} else {
|
||||
struct dev_mc_list *walk;
|
||||
|
||||
walk = dev->mc_list;
|
||||
while (walk != NULL) {
|
||||
netdev_for_each_mc_addr(walk, dev) {
|
||||
u32 a, b;
|
||||
a = le32_to_cpu(*(__le32 *) walk->dmi_addr);
|
||||
b = le16_to_cpu(*(__le16 *) (&walk->dmi_addr[4]));
|
||||
@@ -3114,7 +3113,6 @@ static void nv_set_multicast(struct net_device *dev)
|
||||
alwaysOff[0] &= ~a;
|
||||
alwaysOn[1] &= b;
|
||||
alwaysOff[1] &= ~b;
|
||||
walk = walk->next;
|
||||
}
|
||||
}
|
||||
addr[0] = alwaysOn[0];
|
||||
|
Reference in New Issue
Block a user