aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-02 03:32:56 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-02 03:32:56 -0400
commit6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch)
treeec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/e1000e/netdev.c
parent0625491493d9000e4556bf566d205c28c8e7dc4e (diff)
parent2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 428bf6d72f3..0f8d9619ade 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4539,8 +4539,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
4539 /* Allow time for pending master requests to run */ 4539 /* Allow time for pending master requests to run */
4540 e1000e_disable_pcie_master(&adapter->hw); 4540 e1000e_disable_pcie_master(&adapter->hw);
4541 4541
4542 if ((adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) && 4542 if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
4543 !(hw->mac.ops.check_mng_mode(hw))) {
4544 /* enable wakeup by the PHY */ 4543 /* enable wakeup by the PHY */
4545 retval = e1000_init_phy_wakeup(adapter, wufc); 4544 retval = e1000_init_phy_wakeup(adapter, wufc);
4546 if (retval) 4545 if (retval)
@@ -4558,7 +4557,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
4558 *enable_wake = !!wufc; 4557 *enable_wake = !!wufc;
4559 4558
4560 /* make sure adapter isn't asleep if manageability is enabled */ 4559 /* make sure adapter isn't asleep if manageability is enabled */
4561 if (adapter->flags & FLAG_MNG_PT_ENABLED) 4560 if ((adapter->flags & FLAG_MNG_PT_ENABLED) ||
4561 (hw->mac.ops.check_mng_mode(hw)))
4562 *enable_wake = true; 4562 *enable_wake = true;
4563 4563
4564 if (adapter->hw.phy.type == e1000_phy_igp_3) 4564 if (adapter->hw.phy.type == e1000_phy_igp_3)
@@ -4671,14 +4671,6 @@ static int e1000_resume(struct pci_dev *pdev)
4671 return err; 4671 return err;
4672 } 4672 }
4673 4673
4674 /* AER (Advanced Error Reporting) hooks */
4675 err = pci_enable_pcie_error_reporting(pdev);
4676 if (err) {
4677 dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed "
4678 "0x%x\n", err);
4679 /* non-fatal, continue */
4680 }
4681
4682 pci_set_master(pdev); 4674 pci_set_master(pdev);
4683 4675
4684 pci_enable_wake(pdev, PCI_D3hot, 0); 4676 pci_enable_wake(pdev, PCI_D3hot, 0);
@@ -4991,6 +4983,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4991 if (err) 4983 if (err)
4992 goto err_pci_reg; 4984 goto err_pci_reg;
4993 4985
4986 /* AER (Advanced Error Reporting) hooks */
4987 err = pci_enable_pcie_error_reporting(pdev);
4988 if (err) {
4989 dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed "
4990 "0x%x\n", err);
4991 /* non-fatal, continue */
4992 }
4993
4994 pci_set_master(pdev); 4994 pci_set_master(pdev);
4995 /* PCI config space info */ 4995 /* PCI config space info */
4996 err = pci_save_state(pdev); 4996 err = pci_save_state(pdev);