From 41a745a5ef607336547bb59f6d61dd0b1c550e84 Mon Sep 17 00:00:00 2001 From: Peter P Waskiewicz Jr Date: Thu, 4 Jun 2009 11:09:58 +0000 Subject: [PATCH] --- yaml --- r: 150707 b: refs/heads/master c: bdf0a550c81c293f22bc511e3cd2d0bf1d847d47 h: refs/heads/master i: 150705: 5a76fe24067808cbe3b7e4eaa44f2764421249de 150703: 29ce14550837c2b3ce706f8b5ca79f76f022d806 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bcd43abca8b8..dd5976866f7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d217d7ffc3433d8b157e1fb6c68a07197a182d5 +refs/heads/master: bdf0a550c81c293f22bc511e3cd2d0bf1d847d47 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index de70a2df9aeb..043acab5cb07 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -5282,6 +5282,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, case IXGBE_DEV_ID_82599_KX4: adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX | IXGBE_WUFC_MC | IXGBE_WUFC_BC); + /* Enable ACPI wakeup in GRC */ + IXGBE_WRITE_REG(hw, IXGBE_GRC, + (IXGBE_READ_REG(hw, IXGBE_GRC) & ~IXGBE_GRC_APME)); break; default: adapter->wol = 0;