summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-11-16 07:00:08 +0100
committerDavid S. Miller <davem@davemloft.net>2011-11-17 02:24:52 +0100
commitbbc13ab9d26f4ff675775dd7dc24d5cae17b85d5 (patch)
treee07632d64f41b7b52ca634ce803e47a72c2ea72c /drivers/net
parentMAINTAINERS: change email address for shemminger (diff)
downloadlinux-bbc13ab9d26f4ff675775dd7dc24d5cae17b85d5.tar.xz
linux-bbc13ab9d26f4ff675775dd7dc24d5cae17b85d5.zip
r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
We are checking whether the MCR0_HASHEN bit is set using a logical and instead of bitwise and, fix that. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/rdc/r6040.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 1fc01ca72b46..4bf68cfef390 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -940,7 +940,7 @@ static void r6040_multicast_list(struct net_device *dev)
iowrite16(lp->mcr0, ioaddr + MCR0);
/* Fill the MAC hash tables with their values */
- if (lp->mcr0 && MCR0_HASH_EN) {
+ if (lp->mcr0 & MCR0_HASH_EN) {
iowrite16(hash_table[0], ioaddr + MAR0);
iowrite16(hash_table[1], ioaddr + MAR1);
iowrite16(hash_table[2], ioaddr + MAR2);