diff options
Diffstat (limited to 'drivers/net/sunlance.c')
| -rw-r--r-- | drivers/net/sunlance.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index d7c73f478ef5..c7748b73fa09 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -78,7 +78,6 @@ static char lancestr[] = "LANCE"; | |||
| 78 | #include <linux/interrupt.h> | 78 | #include <linux/interrupt.h> | 
| 79 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> | 
| 80 | #include <linux/in.h> | 80 | #include <linux/in.h> | 
| 81 | #include <linux/slab.h> | ||
| 82 | #include <linux/string.h> | 81 | #include <linux/string.h> | 
| 83 | #include <linux/delay.h> | 82 | #include <linux/delay.h> | 
| 84 | #include <linux/init.h> | 83 | #include <linux/init.h> | 
| @@ -94,6 +93,7 @@ static char lancestr[] = "LANCE"; | |||
| 94 | #include <linux/dma-mapping.h> | 93 | #include <linux/dma-mapping.h> | 
| 95 | #include <linux/of.h> | 94 | #include <linux/of.h> | 
| 96 | #include <linux/of_device.h> | 95 | #include <linux/of_device.h> | 
| 96 | #include <linux/gfp.h> | ||
| 97 | 97 | ||
| 98 | #include <asm/system.h> | 98 | #include <asm/system.h> | 
| 99 | #include <asm/io.h> | 99 | #include <asm/io.h> | 
| @@ -1170,7 +1170,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1170 | static void lance_load_multicast(struct net_device *dev) | 1170 | static void lance_load_multicast(struct net_device *dev) | 
| 1171 | { | 1171 | { | 
| 1172 | struct lance_private *lp = netdev_priv(dev); | 1172 | struct lance_private *lp = netdev_priv(dev); | 
| 1173 | struct dev_mc_list *dmi; | 1173 | struct netdev_hw_addr *ha; | 
| 1174 | char *addrs; | 1174 | char *addrs; | 
| 1175 | u32 crc; | 1175 | u32 crc; | 
| 1176 | u32 val; | 1176 | u32 val; | 
| @@ -1195,8 +1195,8 @@ static void lance_load_multicast(struct net_device *dev) | |||
| 1195 | return; | 1195 | return; | 
| 1196 | 1196 | ||
| 1197 | /* Add addresses */ | 1197 | /* Add addresses */ | 
| 1198 | netdev_for_each_mc_addr(dmi, dev) { | 1198 | netdev_for_each_mc_addr(ha, dev) { | 
| 1199 | addrs = dmi->dmi_addr; | 1199 | addrs = ha->addr; | 
| 1200 | 1200 | ||
| 1201 | /* multicast address? */ | 1201 | /* multicast address? */ | 
| 1202 | if (!(*addrs & 1)) | 1202 | if (!(*addrs & 1)) | 
