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 50f881aa393..467bcff13cd 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -89,7 +89,6 @@ static const int multicast_filter_limit = 32;  #include <linux/timer.h>  #include <linux/errno.h>  #include <linux/ioport.h> -#include <linux/slab.h>  #include <linux/interrupt.h>  #include <linux/pci.h>  #include <linux/dma-mapping.h> @@ -1704,11 +1703,11 @@ static void rhine_set_rx_mode(struct net_device *dev)  		iowrite32(0xffffffff, ioaddr + MulticastFilter1);  		rx_mode = 0x0C;  	} else { -		struct dev_mc_list *mclist; +		struct netdev_hw_addr *ha;  		memset(mc_filter, 0, sizeof(mc_filter)); -		netdev_for_each_mc_addr(mclist, dev) { -			int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; +		netdev_for_each_mc_addr(ha, dev) { +			int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;  			mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);  		}  |