--- drivers/net/igb/e1000_82575.c

+++ drivers/net/igb/e1000_82575.c

@@ -81,6 +81,7 @@ static s32 igb_get_invariants_82575(stru

break;

case E1000_DEV_ID_82576:

case E1000_DEV_ID_82576_NS:

+ case E1000_DEV_ID_82576_NS_SERDES:

case E1000_DEV_ID_82576_FIBER:

case E1000_DEV_ID_82576_SERDES:

case E1000_DEV_ID_82576_QUAD_COPPER:

@@ -1167,9 +1168,18 @@ static s32 igb_read_mac_addr_82575(struc

{

s32 ret_val = 0;

- if (igb_check_alt_mac_addr(hw))

- ret_val = igb_read_mac_addr(hw);

+ /*

+ * If there's an alternate MAC address place it in RAR0

+ * so that it will override the Si installed default perm

+ * address.

+ */

+ ret_val = igb_check_alt_mac_addr(hw);

+ if (ret_val)

+ goto out;

+

+ ret_val = igb_read_mac_addr(hw);

+out:

return ret_val;

}