aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/eexpress.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/eexpress.c')
-rw-r--r--drivers/net/eexpress.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 7013dc8a6cbc..c31dd0685553 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -111,7 +111,6 @@
111#include <linux/netdevice.h> 111#include <linux/netdevice.h>
112#include <linux/etherdevice.h> 112#include <linux/etherdevice.h>
113#include <linux/skbuff.h> 113#include <linux/skbuff.h>
114#include <linux/slab.h>
115#include <linux/mca-legacy.h> 114#include <linux/mca-legacy.h>
116#include <linux/spinlock.h> 115#include <linux/spinlock.h>
117#include <linux/bitops.h> 116#include <linux/bitops.h>
@@ -1576,7 +1575,7 @@ static void eexp_hw_init586(struct net_device *dev)
1576 1575
1577static void eexp_setup_filter(struct net_device *dev) 1576static void eexp_setup_filter(struct net_device *dev)
1578{ 1577{
1579 struct dev_mc_list *dmi; 1578 struct netdev_hw_addr *ha;
1580 unsigned short ioaddr = dev->base_addr; 1579 unsigned short ioaddr = dev->base_addr;
1581 int count = netdev_mc_count(dev); 1580 int count = netdev_mc_count(dev);
1582 int i; 1581 int i;
@@ -1589,8 +1588,8 @@ static void eexp_setup_filter(struct net_device *dev)
1589 outw(CONF_NR_MULTICAST & ~31, ioaddr+SM_PTR); 1588 outw(CONF_NR_MULTICAST & ~31, ioaddr+SM_PTR);
1590 outw(6*count, ioaddr+SHADOW(CONF_NR_MULTICAST)); 1589 outw(6*count, ioaddr+SHADOW(CONF_NR_MULTICAST));
1591 i = 0; 1590 i = 0;
1592 netdev_for_each_mc_addr(dmi, dev) { 1591 netdev_for_each_mc_addr(ha, dev) {
1593 unsigned short *data = (unsigned short *) dmi->dmi_addr; 1592 unsigned short *data = (unsigned short *) ha->addr;
1594 1593
1595 if (i == count) 1594 if (i == count)
1596 break; 1595 break;