diff options
| author | Robert Mustacchi <rm@joyent.com> | 2013-01-29 21:35:48 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-01-29 21:43:05 +0000 |
| commit | 16c40b242635066cd577c6592bf39503ba006416 (patch) | |
| tree | 594c25cd889b0ba03621d6c7d4fbb7ed8ee2c263 | |
| parent | 29833cc332dfcd612f7672ece19b5b70fea926c6 (diff) | |
| download | illumos-joyent-16c40b242635066cd577c6592bf39503ba006416.tar.gz | |
OS-1845 newer igb models should not handle alternate mac address
| -rw-r--r-- | usr/src/uts/common/io/igb/igb_mac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/igb/igb_mac.c b/usr/src/uts/common/io/igb/igb_mac.c index c1fc9edc43..90cf177acd 100644 --- a/usr/src/uts/common/io/igb/igb_mac.c +++ b/usr/src/uts/common/io/igb/igb_mac.c @@ -333,6 +333,13 @@ e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) DEBUGFUNC("e1000_check_alt_mac_addr_generic"); + /* + * On newer models, the alternate mac address is supposed to be handled + * by hardware and software should just get out of the way. + */ + if (hw->mac.type >= e1000_82580) + return (E1000_SUCCESS); + ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1, &nvm_alt_mac_addr_offset); if (ret_val) { |