diff options
| author | Lennert Buytenhek <buytenh@marvell.com> | 2009-04-09 00:42:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-09 00:42:46 +0200 |
| commit | b5e86db4c7f6397ef86ab5e4a3fbece966935577 (patch) | |
| tree | de3831c539658d1283ba0e8e05be3f83ddd19914 /drivers/net/mv643xx_eth.c | |
| parent | smsc911x: correct debugging message on mii read timeout (diff) | |
| download | linux-b5e86db4c7f6397ef86ab5e4a3fbece966935577.tar.xz linux-b5e86db4c7f6397ef86ab5e4a3fbece966935577.zip | |
mv643xx_eth: don't reset the rx coal timer on interface up
Move SDMA configuration from interface up to port probe, to prevent
overwriting the receive coalescing timer value on interface up.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index a56d9d2df73f..b3185bf2c158 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2274,8 +2274,6 @@ static void port_start(struct mv643xx_eth_private *mp) pscr |= FORCE_LINK_PASS; wrlp(mp, PORT_SERIAL_CONTROL, pscr); - wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); - /* * Configure TX path and queues. */ @@ -2957,6 +2955,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev) netif_carrier_off(dev); + wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); + set_rx_coal(mp, 250); set_tx_coal(mp, 0); |