diff options
Diffstat (limited to 'drivers/net/7990.c')
| -rw-r--r-- | drivers/net/7990.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 4e9a5a20b6a6..f09e59451495 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> | 
| 27 | #include <linux/in.h> | 27 | #include <linux/in.h> | 
| 28 | #include <linux/route.h> | 28 | #include <linux/route.h> | 
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> | 
| 31 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> | 
| 32 | #include <asm/irq.h> | 31 | #include <asm/irq.h> | 
| @@ -595,7 +594,7 @@ static void lance_load_multicast (struct net_device *dev) | |||
| 595 | struct lance_private *lp = netdev_priv(dev); | 594 | struct lance_private *lp = netdev_priv(dev); | 
| 596 | volatile struct lance_init_block *ib = lp->init_block; | 595 | volatile struct lance_init_block *ib = lp->init_block; | 
| 597 | volatile u16 *mcast_table = (u16 *)&ib->filter; | 596 | volatile u16 *mcast_table = (u16 *)&ib->filter; | 
| 598 | struct dev_mc_list *dmi; | 597 | struct netdev_hw_addr *ha; | 
| 599 | char *addrs; | 598 | char *addrs; | 
| 600 | u32 crc; | 599 | u32 crc; | 
| 601 | 600 | ||
| @@ -610,8 +609,8 @@ static void lance_load_multicast (struct net_device *dev) | |||
| 610 | ib->filter [1] = 0; | 609 | ib->filter [1] = 0; | 
| 611 | 610 | ||
| 612 | /* Add addresses */ | 611 | /* Add addresses */ | 
| 613 | netdev_for_each_mc_addr(dmi, dev) { | 612 | netdev_for_each_mc_addr(ha, dev) { | 
| 614 | addrs = dmi->dmi_addr; | 613 | addrs = ha->addr; | 
| 615 | 614 | ||
| 616 | /* multicast address? */ | 615 | /* multicast address? */ | 
| 617 | if (!(*addrs & 1)) | 616 | if (!(*addrs & 1)) | 
