aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c1
-rw-r--r--drivers/net/e1000/e1000_main.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index f133ff0b0b94..8f3a13420278 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1739,6 +1739,7 @@ struct ethtool_ops e1000_ethtool_ops = {
1739 .phys_id = e1000_phys_id, 1739 .phys_id = e1000_phys_id,
1740 .get_stats_count = e1000_get_stats_count, 1740 .get_stats_count = e1000_get_stats_count,
1741 .get_ethtool_stats = e1000_get_ethtool_stats, 1741 .get_ethtool_stats = e1000_get_ethtool_stats,
1742 .get_perm_addr = ethtool_op_get_perm_addr,
1742}; 1743};
1743 1744
1744void e1000_set_ethtool_ops(struct net_device *netdev) 1745void e1000_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ee687c902a20..c062b0ad8262 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;