Attachment 172403 Details for Bug 253988 – Solves issue, patches cleanly against 2.6.18-43.el5

[patch] Solves issue, patches cleanly against 2.6.18-43.el5

tg3-suspend.diff (text/plain), 1.39 KB, created by Traxtopel on 2007-08-24 11:35:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Traxtopel

Created: 2007-08-24 11:35:40 UTC

Size: 1.39 KB

patch

obsolete

>diff -ur linux-2.6.18.noarch.orig/drivers/net/tg3.c linux-2.6.18.noarch/drivers/net/tg3.c
>--- linux-2.6.18.noarch.orig/drivers/net/tg3.c	2007-08-23 19:43:47.000000000 -0400
>+++ linux-2.6.18.noarch/drivers/net/tg3.c	2007-08-23 19:52:59.000000000 -0400
>@@ -63,8 +63,8 @@
> 
> #define DRV_MODULE_NAME		"tg3"
> #define PFX DRV_MODULE_NAME	": "
>-#define DRV_MODULE_VERSION	"3.79"
>-#define DRV_MODULE_RELDATE	"July 18, 2007"
>+#define DRV_MODULE_VERSION     "3.80"
>+#define DRV_MODULE_RELDATE     "August 2, 2007"
> 
> #define TG3_DEF_MAC_MODE	0
> #define TG3_DEF_RX_MODE		0
>@@ -12199,6 +12199,12 @@
> 	struct tg3 *tp = netdev_priv(dev);
> 	int err;
> 
>+        /* PCI register 4 needs to be saved whether netif_running() or not.
>+         * MSI address and data need to be saved if using MSI and
>+         * netif_running().
>+         */
>+        pci_save_state(pdev);
>+
> 	if (!netif_running(dev))
> 		return 0;
> 
>@@ -12218,9 +12224,6 @@
> 	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
> 	tg3_full_unlock(tp);
> 
>-	/* Save MSI address and data for resume.  */
>-	pci_save_state(pdev);
>-
> 	err = tg3_set_power_state(tp, pci_choose_state(pdev, state));
> 	if (err) {
> 		tg3_full_lock(tp, 0);
>@@ -12248,11 +12251,11 @@
> 	struct tg3 *tp = netdev_priv(dev);
> 	int err;
> 
>+        pci_restore_state(tp->pdev);
>+
> 	if (!netif_running(dev))
> 		return 0;
> 
>-	pci_restore_state(tp->pdev);
>-
> 	err = tg3_set_power_state(tp, PCI_D0);
> 	if (err)
> 		return err;

Actions: View | Diff

Attachments on bug 253988: 172403 | 172443