[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>
This commit is contained in:
parent
2160de53cc
commit
9beb0ac17b
2 changed files with 3 additions and 1 deletions
|
@ -1739,6 +1739,7 @@ struct ethtool_ops e1000_ethtool_ops = {
|
||||||
.phys_id = e1000_phys_id,
|
.phys_id = e1000_phys_id,
|
||||||
.get_stats_count = e1000_get_stats_count,
|
.get_stats_count = e1000_get_stats_count,
|
||||||
.get_ethtool_stats = e1000_get_ethtool_stats,
|
.get_ethtool_stats = e1000_get_ethtool_stats,
|
||||||
|
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||||
};
|
};
|
||||||
|
|
||||||
void e1000_set_ethtool_ops(struct net_device *netdev)
|
void e1000_set_ethtool_ops(struct net_device *netdev)
|
||||||
|
|
|
@ -614,8 +614,9 @@ e1000_probe(struct pci_dev *pdev,
|
||||||
if(e1000_read_mac_addr(&adapter->hw))
|
if(e1000_read_mac_addr(&adapter->hw))
|
||||||
DPRINTK(PROBE, ERR, "EEPROM Read Error\n");
|
DPRINTK(PROBE, ERR, "EEPROM Read Error\n");
|
||||||
memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);
|
memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);
|
||||||
|
memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len);
|
||||||
|
|
||||||
if(!is_valid_ether_addr(netdev->dev_addr)) {
|
if(!is_valid_ether_addr(netdev->perm_addr)) {
|
||||||
DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
|
DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto err_eeprom;
|
goto err_eeprom;
|
||||||
|
|
Reference in a new issue