mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 07:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

ixgbe: rename wol_supported to more fitting wol_enabled

Browse Source 
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: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jacob Keller
2013-04-13 05:40:37 +00:00
committed by Jeff Kirsher
parent 5daebbb0b0
commit 6b92b0ba75
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
View File

@@ -1055,7 +1055,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
* LMS state either.
*/
if ((hw->phy.multispeed_fiber && hw->mng_fw_enabled) ||
hw->wol_supported)
hw->wol_enabled)
hw->mac.orig_autoc =
(hw->mac.orig_autoc & ~IXGBE_AUTOC_LMS_MASK) |
curr_lms;

4
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@@ -7540,9 +7540,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* WOL not supported for all devices */
adapter->wol = 0;
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);
if (hw->wol_supported)
if (hw->wol_enabled)
adapter->wol = IXGBE_WUFC_MAG;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);

2
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
View File

@@ -3000,7 +3000,7 @@ struct ixgbe_hw {
bool force_full_reset;
bool allow_unsupported_sfp;
bool mng_fw_enabled;
bool wol_supported;
bool wol_enabled;
};
struct ixgbe_info {