diff options
Diffstat (limited to 'drivers/net/sc92031.c')
-rw-r--r-- | drivers/net/sc92031.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index e35050322f9..d87c4787fff 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
@@ -429,13 +429,13 @@ static void _sc92031_set_mar(struct net_device *dev) | |||
429 | u32 mar0 = 0, mar1 = 0; | 429 | u32 mar0 = 0, mar1 = 0; |
430 | 430 | ||
431 | if ((dev->flags & IFF_PROMISC) || | 431 | if ((dev->flags & IFF_PROMISC) || |
432 | dev->mc_count > multicast_filter_limit || | 432 | netdev_mc_count(dev) > multicast_filter_limit || |
433 | (dev->flags & IFF_ALLMULTI)) | 433 | (dev->flags & IFF_ALLMULTI)) |
434 | mar0 = mar1 = 0xffffffff; | 434 | mar0 = mar1 = 0xffffffff; |
435 | else if (dev->flags & IFF_MULTICAST) { | 435 | else if (dev->flags & IFF_MULTICAST) { |
436 | struct dev_mc_list *mc_list; | 436 | struct dev_mc_list *mc_list; |
437 | 437 | ||
438 | for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) { | 438 | netdev_for_each_mc_addr(mc_list, dev) { |
439 | u32 crc; | 439 | u32 crc; |
440 | unsigned bit = 0; | 440 | unsigned bit = 0; |
441 | 441 | ||
@@ -1589,7 +1589,7 @@ out: | |||
1589 | return 0; | 1589 | return 0; |
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | static struct pci_device_id sc92031_pci_device_id_table[] __devinitdata = { | 1592 | static DEFINE_PCI_DEVICE_TABLE(sc92031_pci_device_id_table) = { |
1593 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) }, | 1593 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) }, |
1594 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) }, | 1594 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) }, |
1595 | { PCI_DEVICE(0x1088, 0x2031) }, | 1595 | { PCI_DEVICE(0x1088, 0x2031) }, |