diff options
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 29330209ad8b..a4cff23dcdf9 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -677,7 +677,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev) | |||
677 | memset(hash_table, 0, sizeof(hash_table)); | 677 | memset(hash_table, 0, sizeof(hash_table)); |
678 | set_bit_le(255, hash_table); /* Broadcast entry */ | 678 | set_bit_le(255, hash_table); /* Broadcast entry */ |
679 | /* This should work on big-endian machines as well. */ | 679 | /* This should work on big-endian machines as well. */ |
680 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 680 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); |
681 | i++, mclist = mclist->next) { | 681 | i++, mclist = mclist->next) { |
682 | int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff; | 682 | int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff; |
683 | 683 | ||
@@ -706,7 +706,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev) | |||
706 | 706 | ||
707 | /* We have <= 14 addresses so we can use the wonderful | 707 | /* We have <= 14 addresses so we can use the wonderful |
708 | 16 address perfect filtering of the Tulip. */ | 708 | 16 address perfect filtering of the Tulip. */ |
709 | for (i = 0, mclist = dev->mc_list; i < dev->mc_count; | 709 | for (i = 0, mclist = dev->mc_list; i < netdev_mc_count(dev); |
710 | i++, mclist = mclist->next) { | 710 | i++, mclist = mclist->next) { |
711 | eaddrs = (u16 *)mclist->dmi_addr; | 711 | eaddrs = (u16 *)mclist->dmi_addr; |
712 | *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++; | 712 | *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++; |
@@ -741,7 +741,7 @@ static void __de_set_rx_mode (struct net_device *dev) | |||
741 | goto out; | 741 | goto out; |
742 | } | 742 | } |
743 | 743 | ||
744 | if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { | 744 | if ((netdev_mc_count(dev) > 1000) || (dev->flags & IFF_ALLMULTI)) { |
745 | /* Too many to filter well -- accept all multicasts. */ | 745 | /* Too many to filter well -- accept all multicasts. */ |
746 | macmode |= AcceptAllMulticast; | 746 | macmode |= AcceptAllMulticast; |
747 | goto out; | 747 | goto out; |
@@ -749,7 +749,7 @@ static void __de_set_rx_mode (struct net_device *dev) | |||
749 | 749 | ||
750 | /* Note that only the low-address shortword of setup_frame is valid! | 750 | /* Note that only the low-address shortword of setup_frame is valid! |
751 | The values are doubled for big-endian architectures. */ | 751 | The values are doubled for big-endian architectures. */ |
752 | if (dev->mc_count > 14) /* Must use a multicast hash table. */ | 752 | if (netdev_mc_count(dev) > 14) /* Must use a multicast hash table. */ |
753 | build_setup_frame_hash (de->setup_frame, dev); | 753 | build_setup_frame_hash (de->setup_frame, dev); |
754 | else | 754 | else |
755 | build_setup_frame_perfect (de->setup_frame, dev); | 755 | build_setup_frame_perfect (de->setup_frame, dev); |