mv643xx_eth: don't reset the rx coal timer on interface up
authorLennert Buytenhek <buytenh@marvell.com>
Wed, 8 Apr 2009 22:42:46 +0000 (15:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2009 22:42:46 +0000 (15:42 -0700)
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>
drivers/net/mv643xx_eth.c

index a56d9d2df73f3b108427a8ee828cb1afb0cb782d..b3185bf2c158b41b02ad4efd6b862775c9a37637 100644 (file)
@@ -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);