Attachment 50783 Details for Bug 115814

[patch] roll up all patches into one

r8169-fix-suspend.diff (text/plain), 1.49 KB, created by Forgotten User ZhJd0F0L3x on 2005-09-24 11:38:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User ZhJd0F0L3x

Created: 2005-09-24 11:38:05 UTC

Size: 1.49 KB

patch

obsolete

>Fix suspend with r8169.
>Tested on a Panasonic CF-51
>
>Author: Karsten Keil <kkeil@suse.de>
>Co-Author: Serguei Leontiev <leo@sai.msu.ru>
>Signed-off-by: Stefan Seyfried <seife@suse.de>
>
>--- linux/drivers/net~/r8169.c	2005-08-29 01:41:01.000000000 +0200
>+++ linux/drivers/net/r8169.c	2005-09-24 13:05:34.000000000 +0200
>@@ -1624,6 +1624,7 @@ static int rtl8169_suspend(struct pci_de
> 		return 0;
> 	
> 	netif_device_detach(dev);
>+	rtl8169_delete_timer(dev);
> 	netif_stop_queue(dev);
> 	spin_lock_irqsave(&tp->lock, flags);
> 
>@@ -1635,6 +1636,11 @@ static int rtl8169_suspend(struct pci_de
> 	tp->stats.rx_missed_errors += RTL_R32(RxMissed);
> 	RTL_W32(RxMissed, 0);
> 	spin_unlock_irqrestore(&tp->lock, flags);
>+
>+	free_irq(dev->irq, dev);
>+	pci_save_state(pdev);
>+	pci_disable_device(pdev);
>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));
> 	
> 	return 0;
> }
>@@ -1642,12 +1648,26 @@ static int rtl8169_suspend(struct pci_de
> static int rtl8169_resume(struct pci_dev *pdev)
> {
> 	struct net_device *dev = pci_get_drvdata(pdev);
>+	int retval;
>+
>+	if (!dev)
>+		return -EINVAL;
>+
>+	pci_set_power_state(pdev, PCI_D0);
>+	pci_restore_state(pdev);
>+	pci_enable_device(pdev);
>+
>+	if ((retval = request_irq(dev->irq, rtl8169_interrupt, SA_SHIRQ, dev->name, dev))) {
>+		printk (KERN_ERR "r8169: request_irq failed in resume error %d\n", retval);
>+		return retval;
>+	}
>+
>+	netif_device_attach(dev);
> 
> 	if (!netif_running(dev))
> 	    return 0;
> 
>-	netif_device_attach(dev);
>-	rtl8169_hw_start(dev);
>+	rtl8169_open(dev);
> 
> 	return 0;
> }

Actions: View | Diff

Attachments on bug 115814: 49763 | 49898 | 49978 | 50783 | 50789