Commit cc098dc7 authored Nov 29, 2009 by Ivan Vecera Committed by David S. Miller Nov 29, 2009

r8169: restore mac addr in rtl8169_remove_one and rtl_shutdown



The newer chipsets (all PCI-E) are known that they need full power cycle
(AC or battery removal) to reset MAC address to a  hardwired one. Previous
patch to address this problem loads the original MAC address from EEPROM.
But it brought other problem for which it is necessary to introduce a new
module parameter.
However, it might suffice to restore the initial MAC address before
shutdown/reboot/kexec and when removing the module.

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bbf31bf1

drivers/net/r8169.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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);