diff options
Diffstat (limited to 'drivers/net/via-rhine.c')
| -rw-r--r-- | drivers/net/via-rhine.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 50f881aa3939..467bcff13cd0 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
| @@ -89,7 +89,6 @@ static const int multicast_filter_limit = 32; | |||
| 89 | #include <linux/timer.h> | 89 | #include <linux/timer.h> | 
| 90 | #include <linux/errno.h> | 90 | #include <linux/errno.h> | 
| 91 | #include <linux/ioport.h> | 91 | #include <linux/ioport.h> | 
| 92 | #include <linux/slab.h> | ||
| 93 | #include <linux/interrupt.h> | 92 | #include <linux/interrupt.h> | 
| 94 | #include <linux/pci.h> | 93 | #include <linux/pci.h> | 
| 95 | #include <linux/dma-mapping.h> | 94 | #include <linux/dma-mapping.h> | 
| @@ -1704,11 +1703,11 @@ static void rhine_set_rx_mode(struct net_device *dev) | |||
| 1704 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); | 1703 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); | 
| 1705 | rx_mode = 0x0C; | 1704 | rx_mode = 0x0C; | 
| 1706 | } else { | 1705 | } else { | 
| 1707 | struct dev_mc_list *mclist; | 1706 | struct netdev_hw_addr *ha; | 
| 1708 | 1707 | ||
| 1709 | memset(mc_filter, 0, sizeof(mc_filter)); | 1708 | memset(mc_filter, 0, sizeof(mc_filter)); | 
| 1710 | netdev_for_each_mc_addr(mclist, dev) { | 1709 | netdev_for_each_mc_addr(ha, dev) { | 
| 1711 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 1710 | int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; | 
| 1712 | 1711 | ||
| 1713 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 1712 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 
| 1714 | } | 1713 | } | 
