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

Commit c407bee8 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: alternate MAC address does not work on device id 0x1060 



This issue is present all the way back to 2.6.34 kernels.

CC: <stable@kernel.org>
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarJeffrey Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent aa02bc70

drivers/net/e1000e/lib.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -190,7 +190,8 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) 
	/* Check for LOM (vs. NIC) or one of two valid mezzanine cards */

	/* Check for LOM (vs. NIC) or one of two valid mezzanine cards */

	if (!((nvm_data & NVM_COMPAT_LOM) ||

	if (!((nvm_data & NVM_COMPAT_LOM) ||

	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||

	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||

	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)))

	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) ||

	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES)))

		goto out;

		goto out;





	ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,

	ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,