diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-11 15:30:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-11 15:30:34 -0400 |
| commit | d122179a3c0fdc71b88cb9e3605f372b1651a9ff (patch) | |
| tree | 63a48b333e7565967b6d7c9e246557bfcb9f225f /drivers/net/fec.c | |
| parent | 419c20465d6319274e7286f0966e2390540e6e0a (diff) | |
| parent | b00916b189d13a615ff05c9242201135992fcda3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/ethtool.c
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 768b840aeb6b..e83f67d22fe3 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1311,6 +1311,9 @@ fec_probe(struct platform_device *pdev) | |||
| 1311 | if (ret) | 1311 | if (ret) |
| 1312 | goto failed_mii_init; | 1312 | goto failed_mii_init; |
| 1313 | 1313 | ||
| 1314 | /* Carrier starts down, phylib will bring it up */ | ||
| 1315 | netif_carrier_off(ndev); | ||
| 1316 | |||
| 1314 | ret = register_netdev(ndev); | 1317 | ret = register_netdev(ndev); |
| 1315 | if (ret) | 1318 | if (ret) |
| 1316 | goto failed_register; | 1319 | goto failed_register; |