diff options
author | Lennert Buytenhek <buytenh@marvell.com> | 2009-04-08 18:42:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-08 18:42:46 -0400 |
commit | b5e86db4c7f6397ef86ab5e4a3fbece966935577 (patch) | |
tree | de3831c539658d1283ba0e8e05be3f83ddd19914 /drivers/net | |
parent | 150899d29367eb60302bcb710e779617d04aceea (diff) |
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')
-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) | |||
2274 | pscr |= FORCE_LINK_PASS; | 2274 | pscr |= FORCE_LINK_PASS; |
2275 | wrlp(mp, PORT_SERIAL_CONTROL, pscr); | 2275 | wrlp(mp, PORT_SERIAL_CONTROL, pscr); |
2276 | 2276 | ||
2277 | wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); | ||
2278 | |||
2279 | /* | 2277 | /* |
2280 | * Configure TX path and queues. | 2278 | * Configure TX path and queues. |
2281 | */ | 2279 | */ |
@@ -2957,6 +2955,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
2957 | 2955 | ||
2958 | netif_carrier_off(dev); | 2956 | netif_carrier_off(dev); |
2959 | 2957 | ||
2958 | wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); | ||
2959 | |||
2960 | set_rx_coal(mp, 250); | 2960 | set_rx_coal(mp, 250); |
2961 | set_tx_coal(mp, 0); | 2961 | set_tx_coal(mp, 0); |
2962 | 2962 | ||