From a1286846effe45acae53e2d5f3068fdc7e4b70ee Mon Sep 17 00:00:00 2001
From: Ivan Vecera <ivecera@redhat.com>
Date: Sun, 29 Nov 2009 23:12:52 -0800
Subject: [PATCH] --- yaml --- r: 168967 b: refs/heads/master c:
 cc098dc705895f6b0109b7e8e026ac2b8ae1c0a1 h: refs/heads/master i:   168965:
 0299965d0be6a207c877996ae22f9aee2e89f024   168963:
 e8d13da58bae6a0c80bcb3e75527747716c9ad43   168959:
 490e891e24e0a04b0510893c3d96d1cea2de7e1b v: v3

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

diff --git a/[refs] b/[refs]
index 5296632c9c15..c7ff7315436a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbf31bf18d34caa87dd01f08bf713635593697f2
+refs/heads/master: cc098dc705895f6b0109b7e8e026ac2b8ae1c0a1
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index b9221bdc7184..0fe2fc90f207 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -3235,6 +3235,10 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
 	flush_scheduled_work();
 
 	unregister_netdev(dev);
+
+	/* restore original MAC address */
+	rtl_rar_set(tp, dev->perm_addr);
+
 	rtl_disable_msi(pdev, tp);
 	rtl8169_release_board(pdev, dev, tp->mmio_addr);
 	pci_set_drvdata(pdev, NULL);
@@ -4881,6 +4885,9 @@ static void rtl_shutdown(struct pci_dev *pdev)
 
 	rtl8169_net_suspend(dev);
 
+	/* restore original MAC address */
+	rtl_rar_set(tp, dev->perm_addr);
+
 	spin_lock_irq(&tp->lock);
 
 	rtl8169_asic_down(ioaddr);