diff options
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 4fd1d8b38788..746fb91a0fb0 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/netdevice.h> | 41 | #include <linux/netdevice.h> |
| 42 | #include <linux/platform_device.h> | 42 | #include <linux/platform_device.h> |
| 43 | #include <linux/sched.h> | 43 | #include <linux/sched.h> |
| 44 | #include <linux/slab.h> | ||
| 45 | #include <linux/timer.h> | 44 | #include <linux/timer.h> |
| 46 | #include <linux/bug.h> | 45 | #include <linux/bug.h> |
| 47 | #include <linux/bitops.h> | 46 | #include <linux/bitops.h> |
| @@ -1383,13 +1382,13 @@ static void smsc911x_set_multicast_list(struct net_device *dev) | |||
| 1383 | /* Enabling specific multicast addresses */ | 1382 | /* Enabling specific multicast addresses */ |
| 1384 | unsigned int hash_high = 0; | 1383 | unsigned int hash_high = 0; |
| 1385 | unsigned int hash_low = 0; | 1384 | unsigned int hash_low = 0; |
| 1386 | struct dev_mc_list *mc_list; | 1385 | struct netdev_hw_addr *ha; |
| 1387 | 1386 | ||
| 1388 | pdata->set_bits_mask = MAC_CR_HPFILT_; | 1387 | pdata->set_bits_mask = MAC_CR_HPFILT_; |
| 1389 | pdata->clear_bits_mask = (MAC_CR_PRMS_ | MAC_CR_MCPAS_); | 1388 | pdata->clear_bits_mask = (MAC_CR_PRMS_ | MAC_CR_MCPAS_); |
| 1390 | 1389 | ||
| 1391 | netdev_for_each_mc_addr(mc_list, dev) { | 1390 | netdev_for_each_mc_addr(ha, dev) { |
| 1392 | unsigned int bitnum = smsc911x_hash(mc_list->dmi_addr); | 1391 | unsigned int bitnum = smsc911x_hash(ha->addr); |
| 1393 | unsigned int mask = 0x01 << (bitnum & 0x1F); | 1392 | unsigned int mask = 0x01 << (bitnum & 0x1F); |
| 1394 | 1393 | ||
| 1395 | if (bitnum & 0x20) | 1394 | if (bitnum & 0x20) |
