diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2011-07-07 18:06:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-08 12:03:20 -0400 |
commit | 498d8e236304a62a2774d7264bdff2c6e8102b5b (patch) | |
tree | c1c5fa5ddf09a76bf0787e09fdc71fb8d5561b1c /drivers/net/7990.c | |
parent | 40f5d72a4fc098c47068e3888cfb055922f6519f (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/7990.c')
-rw-r--r-- | drivers/net/7990.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 903bcb3ef5bd..60b35fb5f524 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
@@ -594,7 +594,6 @@ static void lance_load_multicast (struct net_device *dev) | |||
594 | volatile struct lance_init_block *ib = lp->init_block; | 594 | volatile struct lance_init_block *ib = lp->init_block; |
595 | volatile u16 *mcast_table = (u16 *)&ib->filter; | 595 | volatile u16 *mcast_table = (u16 *)&ib->filter; |
596 | struct netdev_hw_addr *ha; | 596 | struct netdev_hw_addr *ha; |
597 | char *addrs; | ||
598 | u32 crc; | 597 | u32 crc; |
599 | 598 | ||
600 | /* set all multicast bits */ | 599 | /* set all multicast bits */ |
@@ -609,13 +608,7 @@ static void lance_load_multicast (struct net_device *dev) | |||
609 | 608 | ||
610 | /* Add addresses */ | 609 | /* Add addresses */ |
611 | netdev_for_each_mc_addr(ha, dev) { | 610 | netdev_for_each_mc_addr(ha, dev) { |
612 | addrs = ha->addr; | 611 | crc = ether_crc_le(6, ha->addr); |
613 | |||
614 | /* multicast address? */ | ||
615 | if (!(*addrs & 1)) | ||
616 | continue; | ||
617 | |||
618 | crc = ether_crc_le(6, addrs); | ||
619 | crc = crc >> 26; | 612 | crc = crc >> 26; |
620 | mcast_table [crc >> 4] |= 1 << (crc & 0xf); | 613 | mcast_table [crc >> 4] |= 1 << (crc & 0xf); |
621 | } | 614 | } |