diff options
| author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 10:48:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:29:32 -0400 |
| commit | a92dd9233ad185904daf95d040cf88c3da2d7ef6 (patch) | |
| tree | c43b02acd9e16948a889d5a4be80358428920945 /drivers/net | |
| parent | 9beb0ac17bcfed23feb0a6fac328216568b74bc1 (diff) | |
| download | talos-obmc-linux-a92dd9233ad185904daf95d040cf88c3da2d7ef6.tar.gz talos-obmc-linux-a92dd9233ad185904daf95d040cf88c3da2d7ef6.zip | |
[PATCH] e100: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to e100.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 25cc20e415da..1c918309539f 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -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, e100_phy_init(nic); 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; |
