diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-17 22:12:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-17 22:12:17 +0000 |
| commit | c2bfcf248afacd0c68643fb3a16f482d8ac971c9 (patch) | |
| tree | d40f046d4474db1ad01dec6d7ee5f7cf657bbcd8 | |
| parent | 6849dcb261e849b6d1503df564f8e27708844bda (diff) | |
Driver reset was loosing the SSRAM bits from emcr when reseting.
| -rw-r--r-- | drivers/net/ioc3-eth.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 7342b98b5..219b6ce00 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c @@ -799,12 +799,11 @@ static void ioc3_init(struct net_device *dev) (dev->dev_addr[1] << 8) | dev->dev_addr[0]; ioc3->ehar_h = ioc3->ehar_l = 0; ioc3->ersr = 42; /* XXX should be random */ - //ioc3->erpir = ERPIR_ARM; ioc3_init_rings(dev, ip, ioc3); ip->emcr |= ((RX_OFFSET / 2) << EMCR_RXOFF_SHIFT) | EMCR_TXDMAEN | - EMCR_TXEN | EMCR_RXDMAEN | EMCR_RXEN; + EMCR_TXEN | EMCR_RXDMAEN | EMCR_RXEN; ioc3->emcr = ip->emcr; ioc3->eier = EISR_RXTIMERINT | EISR_TXEXPLICIT | /* Interrupts ... */ EISR_RXMEMERR | EISR_TXMEMERR; @@ -817,7 +816,6 @@ static void ioc3_stop(struct net_device *dev) struct ioc3 *ioc3 = ip->regs; ioc3->emcr = 0; /* Shutup */ - ip->emcr = 0; ioc3->eier = 0; /* Disable interrupts */ ioc3->eier; /* Flush */ } |