From 257c5276944984e1f8870315a80c28c054382126 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 24 Aug 2012 18:04:38 +0100 Subject: [PATCH] --- yaml --- r: 327709 b: refs/heads/master c: 8f8b3d518999fd1c342310910aa1e49112c86d05 h: refs/heads/master i: 327707: a88e1a4ed1122e8612439d802656625dbb6240cf v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/efx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cdb7666e7684..67a8a21282d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adeb15aa1ce3413d461ec0958a979e9d64cd764c +refs/heads/master: 8f8b3d518999fd1c342310910aa1e49112c86d05 diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c index 92f002029481..a606db43c5ba 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.c +++ b/trunk/drivers/net/ethernet/sfc/efx.c @@ -2120,6 +2120,9 @@ static int efx_register_netdev(struct efx_nic *efx) goto fail_locked; efx_update_name(efx); + /* Always start with carrier off; PHY events will detect the link */ + netif_carrier_off(net_dev); + rc = register_netdevice(net_dev); if (rc) goto fail_locked; @@ -2130,9 +2133,6 @@ static int efx_register_netdev(struct efx_nic *efx) efx_init_tx_queue_core_txq(tx_queue); } - /* Always start with carrier off; PHY events will detect the link */ - netif_carrier_off(net_dev); - rtnl_unlock(); rc = device_create_file(&efx->pci_dev->dev, &dev_attr_phy_type);