Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[PATCH] e1000: support ETHTOOL_GPERMADDR 



Add support for ETHTOOL_GPERMADDR to e1000.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 2160de53

drivers/net/e1000/e1000_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1739,6 +1739,7 @@ struct ethtool_ops e1000_ethtool_ops = { 
	.phys_id                = e1000_phys_id,

	.get_stats_count        = e1000_get_stats_count,

	.get_ethtool_stats      = e1000_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



void e1000_set_ethtool_ops(struct net_device *netdev)

drivers/net/e1000/e1000_main.c

+2 −1
Original line number Diff line number Diff line
@@ -614,8 +614,9 @@ e1000_probe(struct pci_dev *pdev, 
	if(e1000_read_mac_addr(&adapter->hw))

		DPRINTK(PROBE, ERR, "EEPROM Read Error\n");

	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");

		err = -EIO;

		goto err_eeprom;