[PATCH] Enable suspend/resuming of e1000

[Alexander Gran <alex@zodiac.dnsalias.org>]

[-- Attachment #1: Type: Text/Plain, Size: 701 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

suspending of the e1000 in my Thinkpad did not work, so I jst started some 
hacking. The attached patch does the trick for me, it just disables/enables 
the device. I used 2.6.7-rc1-mm1, but it should apply to rc1 also. If it's 
correct (Hey, I'm just beginning..), it could perhaps be 
applied to mainline / mm?

regards
Alex
- -- 
Encrypted Mails welcome.
PGP-Key at http://zodiac.dnsalias.org/misc/pgpkey.asc | Key-ID: 0x6D7DD291


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAtyq4/aHb+2190pERAmXwAKCTQ15yCP8KhcIE437od8v2IrqndwCeMW1w
BeOJRrYbRJHeu4NDdwXxrLE=
=qIVX
-----END PGP SIGNATURE-----

[-- Attachment #2: e1000-suspend-resume.patch --]
[-- Type: text/x-diff, Size: 542 bytes --]

--- linux-2.6.7-rc1-ag1/drivers/net/e1000/e1000_main.c	2004-05-26 23:25:40.000000000 +0200
+++ linux-2.6.7-rc1-mm1/drivers/net/e1000/e1000_main.c	2004-05-27 23:53:54.000000000 +0200
@@ -2864,6 +2864,8 @@
 		}
 	}
 
+	pci_disable_device(pdev);
+	
 	state = (state > 0) ? 3 : 0;
 	pci_set_power_state(pdev, state);
 
@@ -2874,6 +2876,8 @@
 static int
 e1000_resume(struct pci_dev *pdev)
 {
+        pci_enable_device(pdev);
+
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct e1000_adapter *adapter = netdev->priv;
 	uint32_t manc;