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

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

[PATCH] pcnet32: support ETHTOOL_GPERMADDR 



Add support for ETHTOOL_GPERMADDR to pcnet32.

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

drivers/net/pcnet32.c

+3 −1
Original line number Diff line number Diff line
@@ -957,6 +957,7 @@ static struct ethtool_ops pcnet32_ethtool_ops = { 
    .phys_id		= pcnet32_phys_id,

    .get_regs_len	= pcnet32_get_regs_len,

    .get_regs		= pcnet32_get_regs,

    .get_perm_addr	= ethtool_op_get_perm_addr,

};



/* only probes for non-PCI devices, the rest are handled by
@@ -1185,9 +1186,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) 
	    memcpy(dev->dev_addr, promaddr, 6);

	}

    }

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



    /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */

    if (!is_valid_ether_addr(dev->dev_addr))

    if (!is_valid_ether_addr(dev->perm_addr))

	memset(dev->dev_addr, 0, sizeof(dev->dev_addr));



    if (pcnet32_debug & NETIF_MSG_PROBE) {