---

yaml --- r: 150707 b: refs/heads/master c: bdf0a55 h: refs/heads/master i: 150705: 5a76fe2 150703: 29ce145 v: v3
git-mirror · Jun 7, 2009 · 41a745a · 41a745a
1 parent 98dcca5
commit 41a745a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;