aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2011-07-16 03:31:33 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-07-22 01:57:15 -0400
commit9417c464ba834ae29982fcd71bc59dc8e734327c (patch)
treedd5c31ce8d377f71bcfd598c1ce2521cd2499ffa
parent34c6ee8181d6ec1ed761ed2fdac4f1b0358e5447 (diff)
ixgbe: only enable WoL for magic packet by default
Martin Wilck <martin.wilck@ts.fujitsu.com> reported that systems using the ixgbe-driver that were capable of WoL were rebooting almost as soon as they were shut down. This is because the default WoL settings enabled magic packet, broadcast, unicast, and multicast. Other Intel devices seem to use the stored eeprom value for initial WoL capabilities. The 82578DM (e1000e) and 82576 (igb) the devices I looked at had only the magic packet enabled in the eeprom, so that seems appropriate on ixgbe-based devices as well. I set the WoL options on my 82578DM to be the same default as the ixgbe devices (umbg) and saw the same as Martin -- almost as soon as my box shutdown, it booted again. This patch changes the default to only be the magic packet. This is the same as the default for most Intel and non-Intel hardware currently upstream. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> CC: Martin Wilck <martin.wilck@ts.fujitsu.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 358f6c9dafe7..c6fa9c7eb738 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7515,18 +7515,15 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7515 case IXGBE_DEV_ID_82599_SFP: 7515 case IXGBE_DEV_ID_82599_SFP:
7516 /* Only this subdevice supports WOL */ 7516 /* Only this subdevice supports WOL */
7517 if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP) 7517 if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)
7518 adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX | 7518 adapter->wol = IXGBE_WUFC_MAG;
7519 IXGBE_WUFC_MC | IXGBE_WUFC_BC);
7520 break; 7519 break;
7521 case IXGBE_DEV_ID_82599_COMBO_BACKPLANE: 7520 case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
7522 /* All except this subdevice support WOL */ 7521 /* All except this subdevice support WOL */
7523 if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ) 7522 if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
7524 adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX | 7523 adapter->wol = IXGBE_WUFC_MAG;
7525 IXGBE_WUFC_MC | IXGBE_WUFC_BC);
7526 break; 7524 break;
7527 case IXGBE_DEV_ID_82599_KX4: 7525 case IXGBE_DEV_ID_82599_KX4:
7528 adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX | 7526 adapter->wol = IXGBE_WUFC_MAG;
7529 IXGBE_WUFC_MC | IXGBE_WUFC_BC);
7530 break; 7527 break;
7531 default: 7528 default:
7532 adapter->wol = 0; 7529 adapter->wol = 0;