aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/fmvj18x_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 7b17404d0858..3d573ed5f7c5 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -1187,19 +1187,19 @@ static void set_rx_mode(struct net_device *dev)
1187 if (dev->flags & IFF_PROMISC) { 1187 if (dev->flags & IFF_PROMISC) {
1188 memset(mc_filter, 0xff, sizeof(mc_filter)); 1188 memset(mc_filter, 0xff, sizeof(mc_filter));
1189 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */ 1189 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */
1190 } else if (dev->mc_count > MC_FILTERBREAK || 1190 } else if (netdev_mc_count(dev) > MC_FILTERBREAK ||
1191 (dev->flags & IFF_ALLMULTI)) { 1191 (dev->flags & IFF_ALLMULTI)) {
1192 /* Too many to filter perfectly -- accept all multicasts. */ 1192 /* Too many to filter perfectly -- accept all multicasts. */
1193 memset(mc_filter, 0xff, sizeof(mc_filter)); 1193 memset(mc_filter, 0xff, sizeof(mc_filter));
1194 outb(2, ioaddr + RX_MODE); /* Use normal mode. */ 1194 outb(2, ioaddr + RX_MODE); /* Use normal mode. */
1195 } else if (dev->mc_count == 0) { 1195 } else if (netdev_mc_empty(dev)) {
1196 memset(mc_filter, 0x00, sizeof(mc_filter)); 1196 memset(mc_filter, 0x00, sizeof(mc_filter));
1197 outb(1, ioaddr + RX_MODE); /* Ignore almost all multicasts. */ 1197 outb(1, ioaddr + RX_MODE); /* Ignore almost all multicasts. */
1198 } else { 1198 } else {
1199 struct dev_mc_list *mclist; 1199 struct dev_mc_list *mclist;
1200 1200
1201 memset(mc_filter, 0, sizeof(mc_filter)); 1201 memset(mc_filter, 0, sizeof(mc_filter));
1202 for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; 1202 for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
1203 i++, mclist = mclist->next) { 1203 i++, mclist = mclist->next) {
1204 unsigned int bit = 1204 unsigned int bit =
1205 ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 26; 1205 ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 26;