diff options
| author |   Akeem G. Abodunrin <akeem.g.abodunrin@intel.com> | 2011-09-02 23:08:55 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-06 03:40:34 -0700 |
| commit | 6538ee62d597ca09035c33838d7516455f4fd3e1 (patch) | |
| tree | 70dbb0d54200a23e92cf0430db0a58309287ede5 /drivers/net/ethernet/intel/igb/e1000_mac.c | |
| parent | igb: Code to prevent overwriting SFP I2C (diff) | |
| download | linux-dev-6538ee62d597ca09035c33838d7516455f4fd3e1.tar.xz linux-dev-6538ee62d597ca09035c33838d7516455f4fd3e1.zip | |
igb: Alternate MAC Address EEPROM Updates
This code check word 0x37 in the EEPROM, if it is 0xFFFF _or_ 0x0000, then
there is no Alternate MAC Address in the EEPROM.
Signed-off-by: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_mac.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c index 2b5ef761d2ab..79071838eb14 100644 --- a/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/drivers/net/ethernet/intel/igb/e1000_mac.c @@ -198,10 +198,10 @@ s32 igb_check_alt_mac_addr(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; |