Commit a92dd923 authored by John W. Linville's avatar John W. Linville Committed by Jeff Garzik
Browse files


Add support for ETHTOOL_GPERMADDR to e100.
Signed-off-by: default avatarJohn W. Linville <>
Signed-off-by: default avatarJeff Garzik <>
parent 9beb0ac1
......@@ -2391,6 +2391,7 @@ static struct ethtool_ops e100_ethtool_ops = {
.phys_id = e100_phys_id,
.get_stats_count = e100_get_stats_count,
.get_ethtool_stats = e100_get_ethtool_stats,
.get_perm_addr = ethtool_op_get_perm_addr,
static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
......@@ -2541,7 +2542,8 @@ static int __devinit e100_probe(struct pci_dev *pdev,
memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
if(!is_valid_ether_addr(netdev->dev_addr)) {
memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
if(!is_valid_ether_addr(netdev->perm_addr)) {
DPRINTK(PROBE, ERR, "Invalid MAC address from "
"EEPROM, aborting.\n");
err = -EAGAIN;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment