From: Bruce Allan Date: Fri, 16 Dec 2011 00:45:35 +0000 (+0000) Subject: e1000e: re-enable alternate MAC address for all devices which support it X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~371 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a30950b78ef6fda0fb3da453f16301cdfb36ac5;p=users%2Fjedix%2Flinux-maple.git e1000e: re-enable alternate MAC address for all devices which support it (cherry picked from commit 7ee913562fb7937595ba97f9b9adbf294b657d5b) Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Joe Jin --- diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 0893ab107adf..78e3f4c0c367 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/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,