diff options
author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 10:48:55 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:29:31 -0400 |
commit | 9beb0ac17bcfed23feb0a6fac328216568b74bc1 (patch) | |
tree | f4caff544ae7816cc02857d7b24f9694418eb43c /drivers/net/e1000/e1000_main.c | |
parent | 2160de53cc17a40ad07bd38bf52dd0bb72dd5183 (diff) |
[PATCH] e1000: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to e1000.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7c8a0a22dcd5..d02883dcc9b3 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -614,8 +614,9 @@ e1000_probe(struct pci_dev *pdev, | |||
614 | if(e1000_read_mac_addr(&adapter->hw)) | 614 | if(e1000_read_mac_addr(&adapter->hw)) |
615 | DPRINTK(PROBE, ERR, "EEPROM Read Error\n"); | 615 | DPRINTK(PROBE, ERR, "EEPROM Read Error\n"); |
616 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 616 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
617 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); | ||
617 | 618 | ||
618 | if(!is_valid_ether_addr(netdev->dev_addr)) { | 619 | if(!is_valid_ether_addr(netdev->perm_addr)) { |
619 | DPRINTK(PROBE, ERR, "Invalid MAC Address\n"); | 620 | DPRINTK(PROBE, ERR, "Invalid MAC Address\n"); |
620 | err = -EIO; | 621 | err = -EIO; |
621 | goto err_eeprom; | 622 | goto err_eeprom; |