diff options
Diffstat (limited to 'drivers/net/macmace.c')
| -rw-r--r-- | drivers/net/macmace.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 13ba8f4afb7e..a6e19fc8a80a 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/bitrev.h> | 30 | #include <linux/bitrev.h> | 
| 31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> | 
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> | 
| 33 | #include <linux/gfp.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> | 
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> | 
| 35 | #include <asm/macintosh.h> | 36 | #include <asm/macintosh.h> | 
| @@ -508,7 +509,7 @@ static void mace_set_multicast(struct net_device *dev) | |||
| 508 | mb->maccc |= PROM; | 509 | mb->maccc |= PROM; | 
| 509 | } else { | 510 | } else { | 
| 510 | unsigned char multicast_filter[8]; | 511 | unsigned char multicast_filter[8]; | 
| 511 | struct dev_mc_list *dmi; | 512 | struct netdev_hw_addr *ha; | 
| 512 | 513 | ||
| 513 | if (dev->flags & IFF_ALLMULTI) { | 514 | if (dev->flags & IFF_ALLMULTI) { | 
| 514 | for (i = 0; i < 8; i++) { | 515 | for (i = 0; i < 8; i++) { | 
| @@ -517,8 +518,8 @@ static void mace_set_multicast(struct net_device *dev) | |||
| 517 | } else { | 518 | } else { | 
| 518 | for (i = 0; i < 8; i++) | 519 | for (i = 0; i < 8; i++) | 
| 519 | multicast_filter[i] = 0; | 520 | multicast_filter[i] = 0; | 
| 520 | netdev_for_each_mc_addr(dmi, dev) { | 521 | netdev_for_each_mc_addr(ha, dev) { | 
| 521 | crc = ether_crc_le(6, dmi->dmi_addr); | 522 | crc = ether_crc_le(6, ha->addr); | 
| 522 | /* bit number in multicast_filter */ | 523 | /* bit number in multicast_filter */ | 
| 523 | i = crc >> 26; | 524 | i = crc >> 26; | 
| 524 | multicast_filter[i >> 3] |= 1 << (i & 7); | 525 | multicast_filter[i >> 3] |= 1 << (i & 7); | 
