diff options
| author | Ivan Vecera <ivecera@redhat.com> | 2011-02-15 02:08:39 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:17:39 -0700 |
| commit | fea891e387dbd48bbe13d5a588059e879eaa8dfe (patch) | |
| tree | df3dea205eaf6a8352b3437e3b51fe604e5ba451 | |
| parent | 30b7cb312baeab0504e4ba1bc5b324abf7afcf68 (diff) | |
drivers/net: Call netif_carrier_off at the end of the probe
commit 0d672e9f8ac320c6d1ea9103db6df7f99ea20361 upstream.
Without calling of netif_carrier_off at the end of the probe the operstate
is unknown when the device is initially opened. By default the carrier is
on so when the device is opened and netif_carrier_on is called the link
watch event is not fired and operstate remains zero (unknown).
This patch fixes this behavior in forcedeth and r8169.
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/forcedeth.c | 2 | ||||
| -rw-r--r-- | drivers/net/r8169.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 0fa1776563a3..4a0762b2808f 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5816,6 +5816,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i goto out_error; } + netif_carrier_off(dev); + dev_printk(KERN_INFO, &pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, " "addr %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", dev->name, diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 2eda96279f8e..b17e356dbd27 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3236,6 +3236,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; |