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

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

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ mac_reset_top: 
		 * 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;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -7540,9 +7540,9 @@ skip_sriov: 
	/* 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);

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE