diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 11:42:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 11:42:35 -0700 |
| commit | 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 (patch) | |
| tree | a6fde6a33965abb6077420cda31e3f1fbe8d3891 /drivers/net/bmac.c | |
| parent | b8112df71cae7d6a86158caeb19d215f56c4f9ab (diff) | |
| parent | 2089a0d38bc9c2cdd084207ebf7082b18cf4bf58 (diff) | |
| download | kernel-crypto-0e396ee43e445cb7c215a98da4e76d0ce354d9d7.tar.gz kernel-crypto-0e396ee43e445cb7c215a98da4e76d0ce354d9d7.tar.xz kernel-crypto-0e396ee43e445cb7c215a98da4e76d0ce354d9d7.zip | |
Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.
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); |