From 930bf0d5d4637de2ee32fcde94917a9008917502 Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 13 Oct 2011 17:28:39 +0000 Subject: [PATCH] --- yaml --- r: 266922 b: refs/heads/master c: 65189d284b48bd2e747e8cf9dfb0ff63b859682f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/e1000_mac.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7663a5159467..0e984565049f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d94eb84f3cc6557870a5bc5aa63cf6dde801fa7 +refs/heads/master: 65189d284b48bd2e747e8cf9dfb0ff63b859682f diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c b/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c index 872119d91afd..bad3e1425ffb 100644 --- a/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/trunk/drivers/net/ethernet/intel/igb/e1000_mac.c @@ -191,6 +191,13 @@ s32 igb_check_alt_mac_addr(struct e1000_hw *hw) u16 offset, nvm_alt_mac_addr_offset, nvm_data; u8 alt_mac_addr[ETH_ALEN]; + /* + * Alternate MAC address is handled by the option ROM for 82580 + * and newer. SW support not required. + */ + if (hw->mac.type >= e1000_82580) + goto out; + ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1, &nvm_alt_mac_addr_offset); if (ret_val) {