diff options
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 70196bc5fe61..2b78e97ea9c0 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> | 
| 40 | #include <linux/in.h> | 40 | #include <linux/in.h> | 
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> | 
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/string.h> | 42 | #include <linux/string.h> | 
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> | 
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> | 
| @@ -58,6 +57,7 @@ | |||
| 58 | #include <linux/bitops.h> | 57 | #include <linux/bitops.h> | 
| 59 | #include <linux/mutex.h> | 58 | #include <linux/mutex.h> | 
| 60 | #include <linux/mm.h> | 59 | #include <linux/mm.h> | 
| 60 | #include <linux/gfp.h> | ||
| 61 | 61 | ||
| 62 | #include <asm/system.h> | 62 | #include <asm/system.h> | 
| 63 | #include <asm/io.h> | 63 | #include <asm/io.h> | 
| @@ -1846,12 +1846,12 @@ static u32 gem_setup_multicast(struct gem *gp) | |||
| 1846 | } else { | 1846 | } else { | 
| 1847 | u16 hash_table[16]; | 1847 | u16 hash_table[16]; | 
| 1848 | u32 crc; | 1848 | u32 crc; | 
| 1849 | struct dev_mc_list *dmi; | 1849 | struct netdev_hw_addr *ha; | 
| 1850 | int i; | 1850 | int i; | 
| 1851 | 1851 | ||
| 1852 | memset(hash_table, 0, sizeof(hash_table)); | 1852 | memset(hash_table, 0, sizeof(hash_table)); | 
| 1853 | netdev_for_each_mc_addr(dmi, gp->dev) { | 1853 | netdev_for_each_mc_addr(ha, gp->dev) { | 
| 1854 | char *addrs = dmi->dmi_addr; | 1854 | char *addrs = ha->addr; | 
| 1855 | 1855 | ||
| 1856 | if (!(*addrs & 1)) | 1856 | if (!(*addrs & 1)) | 
| 1857 | continue; | 1857 | continue; | 
