diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 17:11:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 17:11:28 -0400 |
| commit | 140fedb5f2efd1f23b26afb2d812004556ba9515 (patch) | |
| tree | e645668185518a7947c3cd71b203efaa89c2332b /drivers/net/bmac.c | |
| parent | 91bcc018f9fc5547875e9ec5a3dc09cbc70d4f8e (diff) | |
| parent | 7d17c1d606f6e89778f05554ddea43791d5c92a0 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch iff-running
Diffstat (limited to 'drivers/net/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 734bd4ee3f9..00e5257b176 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -1412,7 +1412,6 @@ static int bmac_open(struct net_device *dev) bp->opened = 1; bmac_reset_and_enable(dev); enable_irq(dev->irq); - dev->flags |= IFF_RUNNING; return 0; } @@ -1425,7 +1424,6 @@ static int bmac_close(struct net_device *dev) int i; bp->sleeping = 1; - dev->flags &= ~(IFF_UP | IFF_RUNNING); /* disable rx and tx */ config = bmread(dev, RXCFG); |