aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ioc3-eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ioc3-eth.c')
-rw-r--r--drivers/net/ioc3-eth.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 70871b9b045a..091ea3377ed0 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -44,6 +44,7 @@
44#include <linux/tcp.h> 44#include <linux/tcp.h>
45#include <linux/udp.h> 45#include <linux/udp.h>
46#include <linux/dma-mapping.h> 46#include <linux/dma-mapping.h>
47#include <linux/gfp.h>
47 48
48#ifdef CONFIG_SERIAL_8250 49#ifdef CONFIG_SERIAL_8250
49#include <linux/serial_core.h> 50#include <linux/serial_core.h>
@@ -1664,7 +1665,7 @@ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1664 1665
1665static void ioc3_set_multicast_list(struct net_device *dev) 1666static void ioc3_set_multicast_list(struct net_device *dev)
1666{ 1667{
1667 struct dev_mc_list *dmi; 1668 struct netdev_hw_addr *ha;
1668 struct ioc3_private *ip = netdev_priv(dev); 1669 struct ioc3_private *ip = netdev_priv(dev);
1669 struct ioc3 *ioc3 = ip->regs; 1670 struct ioc3 *ioc3 = ip->regs;
1670 u64 ehar = 0; 1671 u64 ehar = 0;
@@ -1688,8 +1689,8 @@ static void ioc3_set_multicast_list(struct net_device *dev)
1688 ip->ehar_h = 0xffffffff; 1689 ip->ehar_h = 0xffffffff;
1689 ip->ehar_l = 0xffffffff; 1690 ip->ehar_l = 0xffffffff;
1690 } else { 1691 } else {
1691 netdev_for_each_mc_addr(dmi, dev) { 1692 netdev_for_each_mc_addr(ha, dev) {
1692 char *addr = dmi->dmi_addr; 1693 char *addr = ha->addr;
1693 1694
1694 if (!(*addr & 1)) 1695 if (!(*addr & 1))
1695 continue; 1696 continue;