From 07e202df81c074b3dcdf70b9bd7696060da39b10 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 12 Sep 2005 14:45:08 -0700
Subject: [PATCH] --- yaml --- r: 8713 b: refs/heads/master c:
 24b8e05dc1b03c1f80828e642838511c16e17250 h: refs/heads/master i:   8711:
 2c2207cdcf94397944a2281d60180d3359f1ba6b v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 754473b51b9a..4d7f08d25c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff436977ed3eeca2d39ae40bbfdb1ce58da8453
+refs/heads/master: 24b8e05dc1b03c1f80828e642838511c16e17250
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 83598e32179c..3a2ace01e444 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -5015,6 +5015,7 @@ static struct ethtool_ops bnx2_ethtool_ops = {
 	.phys_id		= bnx2_phys_id,
 	.get_stats_count	= bnx2_get_stats_count,
 	.get_ethtool_stats	= bnx2_get_ethtool_stats,
+	.get_perm_addr		= ethtool_op_get_perm_addr,
 };
 
 /* Called with rtnl_lock */
@@ -5442,6 +5443,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	pci_set_drvdata(pdev, dev);
 
 	memcpy(dev->dev_addr, bp->mac_addr, 6);
+	memcpy(dev->perm_addr, bp->mac_addr, 6);
 	bp->name = board_info[ent->driver_data].name,
 	printk(KERN_INFO "%s: %s (%c%d) PCI%s %s %dMHz found at mem %lx, "
 		"IRQ %d, ",