Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d5109d1 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: enable WoL operation if config bit show WoL capable 



The driver was disabling Wake-on-LAN by default and waiting for the user
to expressly turn it on.  This patch has the driver turning on WoL from
the start if enabled in the hardware config, which matches the behavior
of our other drivers.

Change-ID: I43faedb907f8ba4d1a61b72a7c86072b97af12b1
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 22e05bd6

drivers/net/ethernet/intel/i40e/i40e_main.c

+7 −2
Original line number Diff line number Diff line
@@ -9947,6 +9947,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct i40e_pf *pf;

	struct i40e_hw *hw;

	static u16 pfs_found;

	u16 wol_nvm_bits;

	u16 link_status;

	int err = 0;

	u32 len;
@@ -10163,8 +10164,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	clear_bit(__I40E_SERVICE_SCHED, &pf->state);

	pf->flags |= I40E_FLAG_NEED_LINK_UPDATE;



	/* WoL defaults to disabled */

	/* NVM bit on means WoL disabled for the port */

	i40e_read_nvm_word(hw, I40E_SR_NVM_WAKE_ON_LAN, &wol_nvm_bits);

	if ((1 << hw->port) & wol_nvm_bits || hw->partition_id != 1)

		pf->wol_en = false;

	else

		pf->wol_en = true;

	device_set_wakeup_enable(&pf->pdev->dev, pf->wol_en);



	/* set up the main switch operations */