diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-07 02:10:27 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-07 02:10:27 -0700 |
commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/3c523.c | |
parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/3c523.c')
-rw-r--r-- | drivers/net/3c523.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index dc6e474229b..e2ce41d3828 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c @@ -640,10 +640,8 @@ static int init586(struct net_device *dev) cfg_cmd->time_low = 0x00; cfg_cmd->time_high = 0xf2; cfg_cmd->promisc = 0; - if (dev->flags & (IFF_ALLMULTI | IFF_PROMISC)) { + if (dev->flags & (IFF_ALLMULTI | IFF_PROMISC)) cfg_cmd->promisc = 1; - dev->flags |= IFF_PROMISC; - } cfg_cmd->carr_coll = 0x00; p->scb->cbl_offset = make16(cfg_cmd); |