diff options
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index fbf1c06ec5c1..c15406d46418 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2389,6 +2389,7 @@ static struct ethtool_ops e100_ethtool_ops = { | |||
2389 | .phys_id = e100_phys_id, | 2389 | .phys_id = e100_phys_id, |
2390 | .get_stats_count = e100_get_stats_count, | 2390 | .get_stats_count = e100_get_stats_count, |
2391 | .get_ethtool_stats = e100_get_ethtool_stats, | 2391 | .get_ethtool_stats = e100_get_ethtool_stats, |
2392 | .get_perm_addr = ethtool_op_get_perm_addr, | ||
2392 | }; | 2393 | }; |
2393 | 2394 | ||
2394 | static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 2395 | static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
@@ -2539,7 +2540,8 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2539 | e100_phy_init(nic); | 2540 | e100_phy_init(nic); |
2540 | 2541 | ||
2541 | memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); | 2542 | memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); |
2542 | if(!is_valid_ether_addr(netdev->dev_addr)) { | 2543 | memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN); |
2544 | if(!is_valid_ether_addr(netdev->perm_addr)) { | ||
2543 | DPRINTK(PROBE, ERR, "Invalid MAC address from " | 2545 | DPRINTK(PROBE, ERR, "Invalid MAC address from " |
2544 | "EEPROM, aborting.\n"); | 2546 | "EEPROM, aborting.\n"); |
2545 | err = -EAGAIN; | 2547 | err = -EAGAIN; |