---

yaml --- r: 168967 b: refs/heads/master c: cc098dc h: refs/heads/master i: 168965: 0299965 168963: e8d13da 168959: 490e891 v: v3
git-mirror · Nov 30, 2009 · a128684 · a128684
1 parent 68c7d01
commit a128684
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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);