Patchwork mv643xx_eth: don't reset the rx coal timer on interface up

login
register
mail settings
Submitter Lennert Buytenhek
Date April 8, 2009, 8:44 p.m.
Message ID <20090408204414.GC4738@xi.wantstofly.org>
Download mbox | patch
Permalink /patch/25735/
State Accepted
Delegated to: David Miller
Headers show

Comments

Lennert Buytenhek - April 8, 2009, 8:44 p.m.
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>
---
 drivers/net/mv643xx_eth.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

(The affected code is new in 2.6.30-rcX, so this doesn't apply to 2.6.29.)
David Miller - April 8, 2009, 10:43 p.m.
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 8 Apr 2009 22:44:14 +0200

> 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>

Applied, thanks Lennert.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a56d9d2..b3185bf 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);