aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c505.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c505.c')
-rw-r--r--drivers/net/3c505.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 9257d7ce0378..dadb46a8833a 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1229,8 +1229,8 @@ static void elp_set_mc_list(struct net_device *dev)
1229 /* send a "load multicast list" command to the board, max 10 addrs/cmd */ 1229 /* send a "load multicast list" command to the board, max 10 addrs/cmd */
1230 /* if num_addrs==0 the list will be cleared */ 1230 /* if num_addrs==0 the list will be cleared */
1231 adapter->tx_pcb.command = CMD_LOAD_MULTICAST_LIST; 1231 adapter->tx_pcb.command = CMD_LOAD_MULTICAST_LIST;
1232 adapter->tx_pcb.length = 6 * dev->mc_count; 1232 adapter->tx_pcb.length = 6 * netdev_mc_count(dev);
1233 for (i = 0; i < dev->mc_count; i++) { 1233 for (i = 0; i < netdev_mc_count(dev); i++) {
1234 memcpy(adapter->tx_pcb.data.multicast[i], dmi->dmi_addr, 6); 1234 memcpy(adapter->tx_pcb.data.multicast[i], dmi->dmi_addr, 6);
1235 dmi = dmi->next; 1235 dmi = dmi->next;
1236 } 1236 }
@@ -1244,7 +1244,7 @@ static void elp_set_mc_list(struct net_device *dev)
1244 TIMEOUT_MSG(__LINE__); 1244 TIMEOUT_MSG(__LINE__);
1245 } 1245 }
1246 } 1246 }
1247 if (dev->mc_count) 1247 if (!netdev_mc_empty(dev))
1248 adapter->tx_pcb.data.configure = NO_LOOPBACK | RECV_BROAD | RECV_MULTI; 1248 adapter->tx_pcb.data.configure = NO_LOOPBACK | RECV_BROAD | RECV_MULTI;
1249 else /* num_addrs == 0 */ 1249 else /* num_addrs == 0 */
1250 adapter->tx_pcb.data.configure = NO_LOOPBACK | RECV_BROAD; 1250 adapter->tx_pcb.data.configure = NO_LOOPBACK | RECV_BROAD;