Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 233449
b: refs/heads/master
c: 0d672e9
h: refs/heads/master
i:
  233447: 302a8ea
v: v3
  • Loading branch information
Ivan Vecera authored and David S. Miller committed Feb 17, 2011
1 parent 5891337 commit bb4662d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c600636bd560b04973174caa5e349a72bce51637
refs/heads/master: 0d672e9f8ac320c6d1ea9103db6df7f99ea20361
2 changes: 2 additions & 0 deletions trunk/drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit bb4662d

Please sign in to comment.