From a0829fb3e60b297f2d376a89cea906dd320f6b7b Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Thu, 7 Oct 2010 02:30:30 +0000 Subject: [PATCH] --- yaml --- r: 211495 b: refs/heads/master c: 03c698c93fc15d976738a853a7ccb6ea26396003 h: refs/heads/master i: 211493: 9bacca8b2d7208ef89838c787567aa7d9487f4b5 211491: 9452ea1cb85fef09ad79f234d0a39e488122561b 211487: f1158a1f730bacf8798b16c44c8bdde05c5aaf4c v: v3 --- [refs] | 2 +- trunk/drivers/net/fec.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e02c105c6d8e..a1800bcf567a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82553bb6218d2707d2e6446d7b2313dfd60b48a8 +refs/heads/master: 03c698c93fc15d976738a853a7ccb6ea26396003 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index 768b840aeb6b..e83f67d22fe3 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -1311,6 +1311,9 @@ fec_probe(struct platform_device *pdev) if (ret) goto failed_mii_init; + /* Carrier starts down, phylib will bring it up */ + netif_carrier_off(ndev); + ret = register_netdev(ndev); if (ret) goto failed_register;