e1000 driver updated to fill in the new field in netdevice and use the new
ethtool, "get_perm_addr".
Signed-off-by: Jon Wetzel <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
--- linux-2.6.12.3/drivers/net/e1000/e1000_ethtool.c 2005-07-28
17:28:53.000000000 -0500
+++ linux-2.6.12.3-jw/drivers/net/e1000/e1000_ethtool.c 2005-08-01
12:03:59.000000000 -0500
@@ -1739,6 +1739,7 @@
.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)
--- linux-2.6.12.3/drivers/net/e1000/e1000_main.c 2005-07-28
17:28:53.000000000 -0500
+++ linux-2.6.12.3-jw/drivers/net/e1000/e1000_main.c 2005-08-01
12:33:31.000000000 -0500
@@ -624,8 +624,9 @@
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;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
