diff options
| author | John W. Linville <linville@tuxdriver.com> | 2005-09-12 10:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:29:31 -0400 |
| commit | 9beb0ac17bcfed23feb0a6fac328216568b74bc1 (patch) | |
| tree | f4caff544ae7816cc02857d7b24f9694418eb43c /drivers/net/e1000 | |
| parent | 2160de53cc17a40ad07bd38bf52dd0bb72dd5183 (diff) | |
| download | kernel_samsung_smdk4412-9beb0ac17bcfed23feb0a6fac328216568b74bc1.tar.gz kernel_samsung_smdk4412-9beb0ac17bcfed23feb0a6fac328216568b74bc1.tar.bz2 kernel_samsung_smdk4412-9beb0ac17bcfed23feb0a6fac328216568b74bc1.zip | |
[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>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 1 | ||||
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index f133ff0b0b9..8f3a1342027 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -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) diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7c8a0a22dcd..d02883dcc9b 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -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; |