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

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
index 0893ab107adf320a5b07293fb64596e6e2794315..78e3f4c0c3678ba42b0d9697d7fa154326d93036 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/lib.c
@@ -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,