diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /drivers/net/r8169.c | |
parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 5dba9fa2bc19..f6899c3500b5 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -3235,6 +3235,10 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) | |||
3235 | flush_scheduled_work(); | 3235 | flush_scheduled_work(); |
3236 | 3236 | ||
3237 | unregister_netdev(dev); | 3237 | unregister_netdev(dev); |
3238 | |||
3239 | /* restore original MAC address */ | ||
3240 | rtl_rar_set(tp, dev->perm_addr); | ||
3241 | |||
3238 | rtl_disable_msi(pdev, tp); | 3242 | rtl_disable_msi(pdev, tp); |
3239 | rtl8169_release_board(pdev, dev, tp->mmio_addr); | 3243 | rtl8169_release_board(pdev, dev, tp->mmio_addr); |
3240 | pci_set_drvdata(pdev, NULL); | 3244 | pci_set_drvdata(pdev, NULL); |
@@ -4880,6 +4884,9 @@ static void rtl_shutdown(struct pci_dev *pdev) | |||
4880 | 4884 | ||
4881 | rtl8169_net_suspend(dev); | 4885 | rtl8169_net_suspend(dev); |
4882 | 4886 | ||
4887 | /* restore original MAC address */ | ||
4888 | rtl_rar_set(tp, dev->perm_addr); | ||
4889 | |||
4883 | spin_lock_irq(&tp->lock); | 4890 | spin_lock_irq(&tp->lock); |
4884 | 4891 | ||
4885 | rtl8169_asic_down(ioaddr); | 4892 | rtl8169_asic_down(ioaddr); |