diff options
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r-- | drivers/net/mv643xx_eth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 7d10897dcc85..e1a18e3540ad 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -2388,13 +2388,8 @@ static int mv643xx_eth_open(struct net_device *dev) | |||
2388 | } | 2388 | } |
2389 | } | 2389 | } |
2390 | 2390 | ||
2391 | netif_carrier_off(dev); | ||
2392 | |||
2393 | port_start(mp); | 2391 | port_start(mp); |
2394 | 2392 | ||
2395 | set_rx_coal(mp, 0); | ||
2396 | set_tx_coal(mp, 0); | ||
2397 | |||
2398 | wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX); | 2393 | wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX); |
2399 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); | 2394 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); |
2400 | 2395 | ||
@@ -2960,6 +2955,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
2960 | if (mp->shared->win_protect) | 2955 | if (mp->shared->win_protect) |
2961 | wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect); | 2956 | wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect); |
2962 | 2957 | ||
2958 | netif_carrier_off(dev); | ||
2959 | |||
2960 | set_rx_coal(mp, 0); | ||
2961 | set_tx_coal(mp, 0); | ||
2962 | |||
2963 | err = register_netdev(dev); | 2963 | err = register_netdev(dev); |
2964 | if (err) | 2964 | if (err) |
2965 | goto out; | 2965 | goto out; |