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 a0bd361d5eca..52913155ce47 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/in.h> | 13 | #include <linux/in.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| @@ -25,6 +24,7 @@ | |||
| 25 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 27 | #include <linux/gfp.h> | ||
| 28 | 28 | ||
| 29 | #include <asm/auxio.h> | 29 | #include <asm/auxio.h> |
| 30 | #include <asm/byteorder.h> | 30 | #include <asm/byteorder.h> |
| @@ -999,7 +999,7 @@ static void bigmac_set_multicast(struct net_device *dev) | |||
| 999 | { | 999 | { |
| 1000 | struct bigmac *bp = netdev_priv(dev); | 1000 | struct bigmac *bp = netdev_priv(dev); |
| 1001 | void __iomem *bregs = bp->bregs; | 1001 | void __iomem *bregs = bp->bregs; |
| 1002 | struct dev_mc_list *dmi; | 1002 | struct netdev_hw_addr *ha; |
| 1003 | char *addrs; | 1003 | char *addrs; |
| 1004 | int i; | 1004 | int i; |
| 1005 | u32 tmp, crc; | 1005 | u32 tmp, crc; |
| @@ -1028,8 +1028,8 @@ static void bigmac_set_multicast(struct net_device *dev) | |||
| 1028 | for (i = 0; i < 4; i++) | 1028 | for (i = 0; i < 4; i++) |
| 1029 | hash_table[i] = 0; | 1029 | hash_table[i] = 0; |
| 1030 | 1030 | ||
| 1031 | netdev_for_each_mc_addr(dmi, dev) { | 1031 | netdev_for_each_mc_addr(ha, dev) { |
| 1032 | addrs = dmi->dmi_addr; | 1032 | addrs = ha->addr; |
| 1033 | 1033 | ||
| 1034 | if (!(*addrs & 1)) | 1034 | if (!(*addrs & 1)) |
| 1035 | continue; | 1035 | continue; |
