diff options
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index 7946da94b228..6dbdd4f9d254 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | |||
@@ -1055,7 +1055,7 @@ mac_reset_top: | |||
1055 | * LMS state either. | 1055 | * LMS state either. |
1056 | */ | 1056 | */ |
1057 | if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) || | 1057 | if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) || |
1058 | hw->wol_supported) | 1058 | hw->wol_enabled) |
1059 | hw->mac.orig_autoc = | 1059 | hw->mac.orig_autoc = |
1060 | (hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) | | 1060 | (hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) | |
1061 | curr_lms; | 1061 | curr_lms; |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 783efbb1f7c3..891724ac48b2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -7540,9 +7540,9 @@ skip_sriov: | |||
7540 | /* WOL not supported for all devices */ | 7540 | /* WOL not supported for all devices */ |
7541 | adapter->wol = 0; | 7541 | adapter->wol = 0; |
7542 | hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap); | 7542 | hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap); |
7543 | hw->wol_supported = ixgbe_wol_supported(adapter, pdev->device, | 7543 | hw->wol_enabled = ixgbe_wol_supported(adapter, pdev->device, |
7544 | pdev->subsystem_device); | 7544 | pdev->subsystem_device); |
7545 | if (hw->wol_supported) | 7545 | if (hw->wol_enabled) |
7546 | adapter->wol = IXGBE_WUFC_MAG; | 7546 | adapter->wol = IXGBE_WUFC_MAG; |
7547 | 7547 | ||
7548 | device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); | 7548 | device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index 2661dcf98ee0..100dd92de2dd 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | |||
@@ -3000,7 +3000,7 @@ struct ixgbe_hw { | |||
3000 | bool force_full_reset; | 3000 | bool force_full_reset; |
3001 | bool allow_unsupported_sfp; | 3001 | bool allow_unsupported_sfp; |
3002 | bool mng_fw_enabled; | 3002 | bool mng_fw_enabled; |
3003 | bool wol_supported; | 3003 | bool wol_enabled; |
3004 | }; | 3004 | }; |
3005 | 3005 | ||
3006 | struct ixgbe_info { | 3006 | struct ixgbe_info { |