]> err.no Git - linux-2.6/commitdiff
Fix typo in meth driver
authorChristoph Lameter <cl@linux-foundation.org>
Fri, 11 Jul 2008 21:12:34 +0000 (16:12 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 22 Jul 2008 23:34:21 +0000 (19:34 -0400)
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>
drivers/net/meth.c

index 0b32648a213600fcecae9eda9496a63c996b1768..4cb364e67dc65f5d022663794e6d8d0b32a6255d 100644 (file)
@@ -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;