summaryrefslogtreecommitdiff
path: root/drivers/net/ni52.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-07 02:10:27 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-07 02:10:27 -0700
commit32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch)
tree429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/ni52.c
parent6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff)
parent3859069bc3358772b08bd91efe9edec39a746ea8 (diff)
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ni52.c')
-rw-r--r--drivers/net/ni52.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index a316dcc8a06d..b9a882d362da 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -621,7 +621,7 @@ static int init586(struct net_device *dev)
if (num_addrs > len) {
printk(KERN_ERR "%s: switching to promisc. mode\n",
dev->name);
- dev->flags |= IFF_PROMISC;
+ writeb(0x01, &cfg_cmd->promisc);
}
}
if (dev->flags & IFF_PROMISC)