diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /drivers/net/bmac.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 734bd4ee3f9b..00e5257b176f 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
| @@ -1412,7 +1412,6 @@ static int bmac_open(struct net_device *dev) | |||
| 1412 | bp->opened = 1; | 1412 | bp->opened = 1; |
| 1413 | bmac_reset_and_enable(dev); | 1413 | bmac_reset_and_enable(dev); |
| 1414 | enable_irq(dev->irq); | 1414 | enable_irq(dev->irq); |
| 1415 | dev->flags |= IFF_RUNNING; | ||
| 1416 | return 0; | 1415 | return 0; |
| 1417 | } | 1416 | } |
| 1418 | 1417 | ||
| @@ -1425,7 +1424,6 @@ static int bmac_close(struct net_device *dev) | |||
| 1425 | int i; | 1424 | int i; |
| 1426 | 1425 | ||
| 1427 | bp->sleeping = 1; | 1426 | bp->sleeping = 1; |
| 1428 | dev->flags &= ~(IFF_UP | IFF_RUNNING); | ||
| 1429 | 1427 | ||
| 1430 | /* disable rx and tx */ | 1428 | /* disable rx and tx */ |
| 1431 | config = bmread(dev, RXCFG); | 1429 | config = bmread(dev, RXCFG); |