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

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

e1000e: re-enable alternate MAC address for all devices which support it 



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 70495a50

drivers/net/ethernet/intel/e1000e/lib.c

+2 −5
Original line number Diff line number Diff line
@@ -187,11 +187,8 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) 
	if (ret_val)

		goto out;



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

	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_QUAD) ||

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

	/* not supported on older hardware or 82573 */

	if ((hw->mac.type < e1000_82571) || (hw->mac.type == e1000_82573))

		goto out;



	ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,