diff --git a/[refs] b/[refs]
index 791051aa31e7..9a749d9b810e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6a5325239c20202e18e21e94291bccc659fbf9e
+refs/heads/master: cdc18a670923d01a762d66be582bfe763772d441
diff --git a/trunk/drivers/net/meth.c b/trunk/drivers/net/meth.c
index 0b32648a2136..4cb364e67dc6 100644
--- a/trunk/drivers/net/meth.c
+++ b/trunk/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;