From bb4662d770c5ce4927bfaff12539a699f34d81b4 Mon Sep 17 00:00:00 2001 From: Ivan Vecera Date: Tue, 15 Feb 2011 02:08:39 +0000 Subject: [PATCH] --- yaml --- r: 233449 b: refs/heads/master c: 0d672e9f8ac320c6d1ea9103db6df7f99ea20361 h: refs/heads/master i: 233447: 302a8ea10bca5e276f1e678f568762ee1228daf0 v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 2 ++ trunk/drivers/net/r8169.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a3818de12d1..1191983079e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c600636bd560b04973174caa5e349a72bce51637 +refs/heads/master: 0d672e9f8ac320c6d1ea9103db6df7f99ea20361 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index af09296ef0dd..9c0b1bac6af6 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -5645,6 +5645,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i goto out_error; } + netif_carrier_off(dev); + dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n", dev->name, np->phy_oui, np->phyaddr, dev->dev_addr); diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 59ccf0c5c610..469ab0b7ce31 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -3190,6 +3190,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_dev_run_wake(pdev)) pm_runtime_put_noidle(&pdev->dev); + netif_carrier_off(dev); + out: return rc;