summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux-foundation.org>2008-07-11 16:12:34 -0500
committerJeff Garzik <jgarzik@redhat.com>2008-07-22 19:34:21 -0400
commitcdc18a670923d01a762d66be582bfe763772d441 (patch)
tree581bef3ae0aa22d583698ced4c4c895d7bbbf492 /drivers/net
parenta6a5325239c20202e18e21e94291bccc659fbf9e (diff)
Fix typo in meth driver
An | in an if statement to check a bit? I think this needs to be a &. As a result of this typo meth will always operate in promiscuous mode. Signed-off-by: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/meth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0b32648a213..4cb364e67dc 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -287,7 +287,7 @@ int meth_reset(struct net_device *dev)
/* Initial mode: 10 | Half-duplex | Accept normal packets */
priv->mac_ctrl = METH_ACCEPT_MCAST | METH_DEFAULT_IPG;
- if (dev->flags | IFF_PROMISC)
+ if (dev->flags & IFF_PROMISC)
priv->mac_ctrl |= METH_PROMISC;
mace->eth.mac_ctrl = priv->mac_ctrl;