diff options
Diffstat (limited to 'drivers/net/sunbmac.c')
| -rw-r--r-- | drivers/net/sunbmac.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index a0bd361d5ec..52913155ce4 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c @@ -11,7 +11,6 @@  #include <linux/interrupt.h>  #include <linux/ioport.h>  #include <linux/in.h> -#include <linux/slab.h>  #include <linux/string.h>  #include <linux/delay.h>  #include <linux/init.h> @@ -25,6 +24,7 @@  #include <linux/dma-mapping.h>  #include <linux/of.h>  #include <linux/of_device.h> +#include <linux/gfp.h>  #include <asm/auxio.h>  #include <asm/byteorder.h> @@ -999,7 +999,7 @@ static void bigmac_set_multicast(struct net_device *dev)  {  	struct bigmac *bp = netdev_priv(dev);  	void __iomem *bregs = bp->bregs; -	struct dev_mc_list *dmi; +	struct netdev_hw_addr *ha;  	char *addrs;  	int i;  	u32 tmp, crc; @@ -1028,8 +1028,8 @@ static void bigmac_set_multicast(struct net_device *dev)  		for (i = 0; i < 4; i++)  			hash_table[i] = 0; -		netdev_for_each_mc_addr(dmi, dev) { -			addrs = dmi->dmi_addr; +		netdev_for_each_mc_addr(ha, dev) { +			addrs = ha->addr;  			if (!(*addrs & 1))  				continue;  |