Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104925
b: refs/heads/master
c: cdc18a6
h: refs/heads/master
i:
  104923: 23f3db2
v: v3
  • Loading branch information
Christoph Lameter authored and Jeff Garzik committed Jul 22, 2008
1 parent 73c3d2d commit 851ba75
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6a5325239c20202e18e21e94291bccc659fbf9e
refs/heads/master: cdc18a670923d01a762d66be582bfe763772d441
2 changes: 1 addition & 1 deletion trunk/drivers/net/meth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 851ba75

Please sign in to comment.