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

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

[PATCH] via-rhine: support ETHTOOL_GPERMADDR 



Add support for ETHTOOL_GPERMADDR to via-rhine.

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

drivers/net/via-rhine.c

+3 −1
Original line number Diff line number Diff line
@@ -814,8 +814,9 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, 


	for (i = 0; i < 6; i++)

		dev->dev_addr[i] = ioread8(ioaddr + StationAddr + i);

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	if (!is_valid_ether_addr(dev->dev_addr)) {

	if (!is_valid_ether_addr(dev->perm_addr)) {

		rc = -EIO;

		printk(KERN_ERR "Invalid MAC address\n");

		goto err_out_unmap;
@@ -1829,6 +1830,7 @@ static struct ethtool_ops netdev_ethtool_ops = { 
	.set_wol		= rhine_set_wol,

	.get_sg			= ethtool_op_get_sg,

	.get_tx_csum		= ethtool_op_get_tx_csum,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)