aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/mcs7830.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/usb/mcs7830.c')
-rw-r--r--drivers/net/usb/mcs7830.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 6fc098fe9ff7..34665137f2c3 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -443,9 +443,9 @@ static void mcs7830_data_set_multicast(struct net_device *net)
443 if (net->flags & IFF_PROMISC) { 443 if (net->flags & IFF_PROMISC) {
444 data->config |= HIF_REG_CONFIG_PROMISCUOUS; 444 data->config |= HIF_REG_CONFIG_PROMISCUOUS;
445 } else if (net->flags & IFF_ALLMULTI || 445 } else if (net->flags & IFF_ALLMULTI ||
446 net->mc_count > MCS7830_MAX_MCAST) { 446 netdev_mc_count(net) > MCS7830_MAX_MCAST) {
447 data->config |= HIF_REG_CONFIG_ALLMULTICAST; 447 data->config |= HIF_REG_CONFIG_ALLMULTICAST;
448 } else if (net->mc_count == 0) { 448 } else if (netdev_mc_empty(net)) {
449 /* just broadcast and directed */ 449 /* just broadcast and directed */
450 } else { 450 } else {
451 /* We use the 20 byte dev->data 451 /* We use the 20 byte dev->data
@@ -457,7 +457,7 @@ static void mcs7830_data_set_multicast(struct net_device *net)
457 int i; 457 int i;
458 458
459 /* Build the multicast hash filter. */ 459 /* Build the multicast hash filter. */
460 for (i = 0; i < net->mc_count; i++) { 460 for (i = 0; i < netdev_mc_count(net); i++) {
461 crc_bits = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26; 461 crc_bits = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
462 data->multi_filter[crc_bits >> 3] |= 1 << (crc_bits & 7); 462 data->multi_filter[crc_bits >> 3] |= 1 << (crc_bits & 7);
463 mc_list = mc_list->next; 463 mc_list = mc_list->next;