Skip to contentSkip to conversation

mv643xx_eth: move a couple of init actions from ->open() to port probe

PATCH In review Lennert Buytenhek 1 participant 1 message Feb 25, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/4 mv643xx_eth: move a couple of init actions from ->open() to port probe

Move the netif_carrier_off() call in ->open() to port probe, so that ethtool doesn't report the link as being up before we have up'd the interface.

Move initialisation of the rx/tx coalescing timers from ->open() to port probe, so that we don't reset the coalescing timers every time the interface is up'd.

---
 drivers/net/mv643xx_eth.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/mv643xx_eth.c +5 -5
index b711404..2ea964c 100644
@@ -2388,13 +2388,8 @@ static int mv643xx_eth_open(struct net_device *dev)
 		}
 	}
 
-	netif_carrier_off(dev);
-
 	port_start(mp);
 
-	set_rx_coal(mp, 0);
-	set_tx_coal(mp, 0);
-
 	wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX);
 	wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT);
 
@@ -2961,6 +2956,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 	if (mp->shared->win_protect)
 		wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
 
+	netif_carrier_off(dev);
+
+	set_rx_coal(mp, 0);
+	set_tx_coal(mp, 0);
+
 	err = register_netdev(dev);
 	if (err)
 		goto out;
Signature · 1 line
1.5.6.4