rpms/kernel/F-8 linux-2.6-net-e100-disable-polling.patch, NONE, 1.1 kernel.spec, 1.233, 1.234 linux-2.6-e1000-corrupt-eeprom-checksum.patch, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17881

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-e100-disable-polling.patch 
Removed Files:
	linux-2.6-e1000-corrupt-eeprom-checksum.patch 
Log Message:
* Thu Oct 18 2007 Dave Jones <davej at redhat.com>
- Disable polling before registering netdevice in e100.


linux-2.6-net-e100-disable-polling.patch:

--- NEW FILE linux-2.6-net-e100-disable-polling.patch ---
--- linux-2.6.23.noarch/drivers/net/e100.c~	2007-10-18 16:10:40.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/e100.c	2007-10-18 16:16:02.000000000 -0400
@@ -2682,6 +2682,8 @@ static int __devinit e100_probe(struct p
 	if (err)
 		DPRINTK(PROBE, ERR, "Error clearing wake event\n");
 
+	netif_poll_disable(netdev);
+
 	strcpy(netdev->name, "eth%d");
 	if((err = register_netdev(netdev))) {
 		DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n");


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- kernel.spec	18 Oct 2007 14:48:27 -0000	1.233
+++ kernel.spec	18 Oct 2007 20:17:40 -0000	1.234
@@ -689,8 +689,8 @@
 
 # Fix lockdep bug in firewire.
 Patch1900: linux-2.6-firewire-lockdep.patch
-# Work around E1000 corrupt EEPROM problem.
-Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
+# Work around E100 NAPI bug
+Patch2000: linux-2.6-net-e100-disable-polling.patch
 # fix thinkpad key events for volume/brightness
 Patch2100: linux-2.6-thinkpad-key-events.patch
 # SELinux performance patches
@@ -1251,7 +1251,7 @@
 ApplyPatch linux-2.6-lirc.patch
 
 ApplyPatch linux-2.6-firewire-lockdep.patch
-ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
+ApplyPatch linux-2.6-net-e100-disable-polling.patch
 ApplyPatch linux-2.6-thinkpad-key-events.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
@@ -1855,6 +1855,9 @@
 
 
 %changelog
+* Thu Oct 18 2007 Dave Jones <davej at redhat.com>
+- Disable polling before registering netdevice in e100.
+
 * Thu Oct 18 2007 John W. Linville <linville at redhat.com>
 - avoid null ptr dereference in rx path of zd1201 driver
 


--- linux-2.6-e1000-corrupt-eeprom-checksum.patch DELETED ---