diff options
| author | Ivan Vecera <ivecera@redhat.com> | 2011-02-15 03:08:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-17 23:09:57 +0100 |
| commit | 0d672e9f8ac320c6d1ea9103db6df7f99ea20361 (patch) | |
| tree | fb5c67e5bb769601fc7f762b7e86e10f9b7aa30e | |
| parent | ixgbe: work around for DDP last buffer size (diff) | |
| download | linux-0d672e9f8ac320c6d1ea9103db6df7f99ea20361.tar.xz linux-0d672e9f8ac320c6d1ea9103db6df7f99ea20361.zip | |
drivers/net: Call netif_carrier_off at the end of the probe
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>
| -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 af09296ef0dd..9c0b1bac6af6 100644 --- a/drivers/net/forcedeth.c +++ b/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/drivers/net/r8169.c b/drivers/net/r8169.c index 59ccf0c5c610..469ab0b7ce31 100644 --- a/drivers/net/r8169.c +++ b/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; |