Commit 6b92b0ba authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher

ixgbe: rename wol_supported to more fitting wol_enabled

The variable wol_supported really is just checking whether it is enabled, rather
than whether it is supported. If it is enabled it will be supported, but this
does not necessarily hold true the other way around. This patch renames the
variable to avoid confusion.
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5daebbb0
...@@ -1055,7 +1055,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) ...@@ -1055,7 +1055,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
* LMS state either. * LMS state either.
*/ */
if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) || if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) ||
hw->wol_supported) hw->wol_enabled)
hw->mac.orig_autoc = hw->mac.orig_autoc =
(hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) | (hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) |
curr_lms; curr_lms;
......
...@@ -7540,9 +7540,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -7540,9 +7540,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* WOL not supported for all devices */ /* WOL not supported for all devices */
adapter->wol = 0; adapter->wol = 0;
hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap); hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap);
hw->wol_supported = ixgbe_wol_supported(adapter, pdev->device, hw->wol_enabled = ixgbe_wol_supported(adapter, pdev->device,
pdev->subsystem_device); pdev->subsystem_device);
if (hw->wol_supported) if (hw->wol_enabled)
adapter->wol = IXGBE_WUFC_MAG; adapter->wol = IXGBE_WUFC_MAG;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
......
...@@ -3000,7 +3000,7 @@ struct ixgbe_hw { ...@@ -3000,7 +3000,7 @@ struct ixgbe_hw {
bool force_full_reset; bool force_full_reset;
bool allow_unsupported_sfp; bool allow_unsupported_sfp;
bool mng_fw_enabled; bool mng_fw_enabled;
bool wol_supported; bool wol_enabled;
}; };
struct ixgbe_info { struct ixgbe_info {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment