From a66e9ab5d016095bc8be8f0bd6ee9550d814150f Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 12 Sep 2005 10:48:56 -0400 Subject: [PATCH] --- yaml --- r: 10203 b: refs/heads/master c: df859c519ef7b72d9be7396443316da87272e8b6 h: refs/heads/master i: 10201: f25d756eb3e98ba58fa9ce8aaa44703767ff4687 10199: a405da9d1552fb2a092c453dbee9eff371fcee78 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_ethtool.c | 1 + trunk/drivers/net/ixgb/ixgb_main.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 016cc04a4b95..0f1d46fb7308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c704b8566b060695e90ac401833db4b62813ad8a +refs/heads/master: df859c519ef7b72d9be7396443316da87272e8b6 diff --git a/trunk/drivers/net/ixgb/ixgb_ethtool.c b/trunk/drivers/net/ixgb/ixgb_ethtool.c index 9d026ed77ddd..319ee4cd70d8 100644 --- a/trunk/drivers/net/ixgb/ixgb_ethtool.c +++ b/trunk/drivers/net/ixgb/ixgb_ethtool.c @@ -723,6 +723,7 @@ struct ethtool_ops ixgb_ethtool_ops = { .phys_id = ixgb_phys_id, .get_stats_count = ixgb_get_stats_count, .get_ethtool_stats = ixgb_get_ethtool_stats, + .get_perm_addr = ethtool_op_get_perm_addr, }; void ixgb_set_ethtool_ops(struct net_device *netdev) diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index 5c555373adbe..5015eaf4e20a 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -460,8 +460,9 @@ ixgb_probe(struct pci_dev *pdev, } ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr); + memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); - if(!is_valid_ether_addr(netdev->dev_addr)) { + if(!is_valid_ether_addr(netdev->perm_addr)) { err = -EIO; goto err_eeprom; }