Skip to content

Commit

Permalink
mv643xx_eth: move a couple of init actions from ->open() to port probe
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Lennert Buytenhek authored and David S. Miller committed Feb 25, 2009
1 parent ea8a864 commit a5fe361
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -2960,6 +2955,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;
Expand Down

0 comments on commit a5fe361

Please sign in to comment.