diff options
| author |   Bruce Allan <bruce.w.allan@intel.com> | 2011-07-29 05:53:07 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 15:21:05 -0700 |
| commit | 244735f6ebccbf72a283db89472309f770e14c80 (patch) | |
| tree | f9f7710d593e5d2cb7ccbeeeeb53e6ae34469eb6 /drivers/net/e1000e/lib.c | |
| parent | e1000e: do not disable receiver on 82574/82583 (diff) | |
| download | linux-dev-244735f6ebccbf72a283db89472309f770e14c80.tar.xz linux-dev-244735f6ebccbf72a283db89472309f770e14c80.zip | |
e1000e: alternate MAC address update
If word 0x37 in the EEPROM is 0xFFFF _or_ 0x0000, then there is no
alternate MAC address in the EEPROM.
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/e1000e/lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 58af091c8c3a..0893ab107adf 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c @@ -201,10 +201,10 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) goto out; } - if (nvm_alt_mac_addr_offset == 0xFFFF) { + if ((nvm_alt_mac_addr_offset == 0xFFFF) || + (nvm_alt_mac_addr_offset == 0x0000)) /* There is no Alternate MAC Address */ goto out; - } if (hw->bus.func == E1000_FUNC_1) nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1; |