From: Christoph Lameter Date: Fri, 11 Jul 2008 21:12:34 +0000 (-0500) Subject: Fix typo in meth driver X-Git-Tag: v2.6.27-rc1~860^2~3^2~26 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cdc18a670923d01a762d66be582bfe763772d441;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Jeff Garzik --- 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;