diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 07:13:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 07:13:38 +0100 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /drivers/net/r8169.c | |
| parent | net: remove [un]register_pernet_gen_... and update the docs. (diff) | |
| parent | ip_fragment: also adjust skb->truesize for packets not owned by a socket (diff) | |
| download | linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.xz linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.zip | |
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) 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); @@ -4880,6 +4884,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); |