Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1371fa6d authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

r8169: fix suspend/resume for down interface 



The PM hooks are no-op if the r8169 interface is down (i.e. !IFF_UP).
However, as the chipset is enabled, the device will not work after a
suspend/resume cycle. The patch always issue the required PCI suspend
sequence and removes the module unload/reload workaround.

Signed-off-by: default avatarArnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 99f252b0

drivers/net/r8169.c

+7 −6
Original line number Diff line number Diff line
@@ -2890,7 +2890,7 @@ static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state) 
	void __iomem *ioaddr = tp->mmio_addr;



	if (!netif_running(dev))

		goto out;

		goto out_pci_suspend;



	netif_device_detach(dev);

	netif_stop_queue(dev);
@@ -2904,10 +2904,11 @@ static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state) 


	spin_unlock_irq(&tp->lock);



out_pci_suspend:

	pci_save_state(pdev);

	pci_enable_wake(pdev, pci_choose_state(pdev, state), tp->wol_enabled);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));

out:



	return 0;

}
@@ -2915,15 +2916,15 @@ static int rtl8169_resume(struct pci_dev *pdev) 
{

	struct net_device *dev = pci_get_drvdata(pdev);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_enable_wake(pdev, PCI_D0, 0);



	if (!netif_running(dev))

		goto out;



	netif_device_attach(dev);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_enable_wake(pdev, PCI_D0, 0);



	rtl8169_schedule_work(dev, rtl8169_reset_task);

out:

	return 0;