From 091955a401d5e36639bd172faf58df7014e99d6d Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Fri, 16 Dec 2011 00:45:35 +0000 Subject: [PATCH] --- yaml --- r: 289741 b: refs/heads/master c: 7ee913562fb7937595ba97f9b9adbf294b657d5b h: refs/heads/master i: 289739: e30c63ed7425e9c9ada1531fc34fff24156cd5ad v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/lib.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 61f0f23f7885..359ca3512849 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70495a500d787c0c90a136acf454cb7d0eecd82e +refs/heads/master: 7ee913562fb7937595ba97f9b9adbf294b657d5b diff --git a/trunk/drivers/net/ethernet/intel/e1000e/lib.c b/trunk/drivers/net/ethernet/intel/e1000e/lib.c index 0893ab107adf..78e3f4c0c367 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/lib.c +++ b/trunk/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,