Mercurial > illumos > illumos-gate
changeset 13935:79a93e2adfec
3509 igb should not set alternate mac address on newer models
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Michael Speer <michael.speer@pluribusnetworks.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Robert Mustacchi <rm@joyent.com> |
|---|---|
| date | Wed, 30 Jan 2013 10:38:59 -0800 |
| parents | 9e23a7f7b812 |
| children | 60077db1e2cc |
| files | usr/src/uts/common/io/igb/igb_mac.c |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/igb/igb_mac.c Wed Jan 30 12:01:51 2013 -0800 +++ b/usr/src/uts/common/io/igb/igb_mac.c Wed Jan 30 10:38:59 2013 -0800 @@ -333,6 +333,13 @@ 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) {