diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2010-01-12 21:04:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-13 23:31:56 -0500 |
commit | 608f8a0d014db6cd18d4f535934d4b5d556e3013 (patch) | |
tree | 1f3ace492bc08165c81ef7bc06ec7f5222ab1d2d /drivers/net/e1000e/netdev.c | |
parent | 0159f24ee764927bf44c1a25473bd4517febd21c (diff) |
e1000e: use alternate MAC address on ESB2 if available
Similar to 82571/2/3 parts that already do this, if ESB2/80003es2lan parts
have an alternate MAC address provided in the EEPROM use it instead of the
default MAC address. This patch makes the the actual code that does this
generic so that it can be better used by both MAC families.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index c3745c9d21aa..0d5ef4c5c6db 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -5135,7 +5135,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
5135 | 5135 | ||
5136 | e1000_eeprom_checks(adapter); | 5136 | e1000_eeprom_checks(adapter); |
5137 | 5137 | ||
5138 | /* copy the MAC address out of the NVM */ | 5138 | /* copy the MAC address */ |
5139 | if (e1000e_read_mac_addr(&adapter->hw)) | 5139 | if (e1000e_read_mac_addr(&adapter->hw)) |
5140 | e_err("NVM Read Error while reading MAC address\n"); | 5140 | e_err("NVM Read Error while reading MAC address\n"); |
5141 | 5141 | ||