diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-22 04:22:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-22 18:45:52 -0500 |
commit | 48e2f183cb1709600012265a2e723f45a350d5fe (patch) | |
tree | 608368bda6f159342c307deca3b03998d25434c8 /drivers/net/eepro.c | |
parent | 7a81e9f3ca712db82344ea3ab2a5879241f59c48 (diff) |
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>
Diffstat (limited to 'drivers/net/eepro.c')
-rw-r--r-- | drivers/net/eepro.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 5f73ab22db16..1b05bdf62c3c 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1287,7 +1287,7 @@ set_multicast_list(struct net_device *dev) | |||
1287 | struct eepro_local *lp = netdev_priv(dev); | 1287 | struct eepro_local *lp = netdev_priv(dev); |
1288 | short ioaddr = dev->base_addr; | 1288 | short ioaddr = dev->base_addr; |
1289 | unsigned short mode; | 1289 | unsigned short mode; |
1290 | struct dev_mc_list *dmi=dev->mc_list; | 1290 | struct dev_mc_list *dmi; |
1291 | int mc_count = netdev_mc_count(dev); | 1291 | int mc_count = netdev_mc_count(dev); |
1292 | 1292 | ||
1293 | if (dev->flags&(IFF_ALLMULTI|IFF_PROMISC) || mc_count > 63) | 1293 | if (dev->flags&(IFF_ALLMULTI|IFF_PROMISC) || mc_count > 63) |
@@ -1332,10 +1332,8 @@ set_multicast_list(struct net_device *dev) | |||
1332 | outw(0, ioaddr + IO_PORT); | 1332 | outw(0, ioaddr + IO_PORT); |
1333 | outw(6 * (mc_count + 1), ioaddr + IO_PORT); | 1333 | outw(6 * (mc_count + 1), ioaddr + IO_PORT); |
1334 | 1334 | ||
1335 | for (i = 0; i < mc_count; i++) | 1335 | netdev_for_each_mc_addr(dmi, dev) { |
1336 | { | 1336 | eaddrs = (unsigned short *) dmi->dmi_addr; |
1337 | eaddrs=(unsigned short *)dmi->dmi_addr; | ||
1338 | dmi=dmi->next; | ||
1339 | outw(*eaddrs++, ioaddr + IO_PORT); | 1337 | outw(*eaddrs++, ioaddr + IO_PORT); |
1340 | outw(*eaddrs++, ioaddr + IO_PORT); | 1338 | outw(*eaddrs++, ioaddr + IO_PORT); |
1341 | outw(*eaddrs++, ioaddr + IO_PORT); | 1339 | outw(*eaddrs++, ioaddr + IO_PORT); |