aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/a2065.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2011-07-07 18:06:26 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-08 12:03:20 -0400
commit498d8e236304a62a2774d7264bdff2c6e8102b5b (patch)
treec1c5fa5ddf09a76bf0787e09fdc71fb8d5561b1c /drivers/net/a2065.c
parent40f5d72a4fc098c47068e3888cfb055922f6519f (diff)
drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr
There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. This patch covers all remaining network drivers still containing such a check. Cc: Joe Perches <joe@perches.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/a2065.c')
-rw-r--r--drivers/net/a2065.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 7d9a1a6ea8b2..e1e1b07d9b8d 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -587,7 +587,6 @@ static void lance_load_multicast(struct net_device *dev)
587 volatile struct lance_init_block *ib = lp->init_block; 587 volatile struct lance_init_block *ib = lp->init_block;
588 volatile u16 *mcast_table = (u16 *)&ib->filter; 588 volatile u16 *mcast_table = (u16 *)&ib->filter;
589 struct netdev_hw_addr *ha; 589 struct netdev_hw_addr *ha;
590 char *addrs;
591 u32 crc; 590 u32 crc;
592 591
593 /* set all multicast bits */ 592 /* set all multicast bits */
@@ -602,13 +601,7 @@ static void lance_load_multicast(struct net_device *dev)
602 601
603 /* Add addresses */ 602 /* Add addresses */
604 netdev_for_each_mc_addr(ha, dev) { 603 netdev_for_each_mc_addr(ha, dev) {
605 addrs = ha->addr; 604 crc = ether_crc_le(6, ha->addr);
606
607 /* multicast address? */
608 if (!(*addrs & 1))
609 continue;
610
611 crc = ether_crc_le(6, addrs);
612 crc = crc >> 26; 605 crc = crc >> 26;
613 mcast_table[crc >> 4] |= 1 << (crc & 0xf); 606 mcast_table[crc >> 4] |= 1 << (crc & 0xf);
614 } 607 }