rpms/kernel/F-7 linux-2.6-net-e1000-fix-netif_poll_enable-crash-in-e1000_open.patch, NONE, 1.1 kernel-2.6.spec, 1.3211, 1.3212 linux-2.6-net-e1000-debug-shirq.patch, 1.1, NONE linux-2.6-net-e1000-no-polling-in-open.patch, 1.1, NONE

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-e1000-fix-netif_poll_enable-crash-in-e1000_open.patch 
Removed Files:
	linux-2.6-net-e1000-debug-shirq.patch 
	linux-2.6-net-e1000-no-polling-in-open.patch 
Log Message:
* Fri Jun 01 2007 Dave Jones <davej at redhat.com>
- E1000: Fix netif_poll_enable crash in e1000_open.


linux-2.6-net-e1000-fix-netif_poll_enable-crash-in-e1000_open.patch:

--- NEW FILE linux-2.6-net-e1000-fix-netif_poll_enable-crash-in-e1000_open.patch ---
>From herbert at gondor.apana.org.au  Wed May 23 18:29:38 2007
Date: Thu, 24 May 2007 11:29:21 +1000
Message-ID: <20070524012921.GA2943 at gondor.apana.org.au>
From: Herbert Xu <herbert at gondor.apana.org.au>
To: Chris Wright <chrisw at sous-sol.org>
Cc: auke-jan.h.kok at intel.com, cebbert at redhat.com, jeff at garzik.org, stable at kernel.org, greg at kroah.com, e1000-devel at lists.sourceforge.net, davej at redhat.com
Subject: E1000: Fix netif_poll_enable crash in e1000_open

e1000_open calls e1000_up which will always call netif_poll_enable.
However, it's illegal to call netif_poll_enable without calling
netif_poll_disable at some prior time.  This constraint is violated
in e1000_open.

This patch fixes it by simply calling netif_poll_disable in e1000_open.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Acked-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>

---
 drivers/net/e1000/e1000_main.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.21.3.orig/drivers/net/e1000/e1000_main.c
+++ linux-2.6.21.3/drivers/net/e1000/e1000_main.c
@@ -1423,6 +1423,7 @@ e1000_open(struct net_device *netdev)
 
 	e1000_power_up_phy(adapter);
 
+	netif_poll_disable(netdev);
 	if ((err = e1000_up(adapter)))
 		goto err_up;
 	adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3211
retrieving revision 1.3212
diff -u -r1.3211 -r1.3212
--- kernel-2.6.spec	31 May 2007 23:43:01 -0000	1.3211
+++ kernel-2.6.spec	2 Jun 2007 00:26:44 -0000	1.3212
@@ -555,8 +555,7 @@
 
 # NIC driver fixes
 Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
-Patch1301: linux-2.6-net-e1000-debug-shirq.patch
-Patch1302: linux-2.6-net-e1000-no-polling-in-open.patch
+Patch1301: linux-2.6-net-e1000-fix-netif_poll_enable-crash-in-e1000_open.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -1301,9 +1300,8 @@
 # NIC driver fixes
 # Don't print warnings about MSI failures on e1000
 %patch1300 -p1
-# Fix up e1000 oops (#240339)
+# E1000: Fix netif_poll_enable crash in e1000_open
 %patch1301 -p1
-%patch1302 -p1
 
 # Filesystem patches.
 # Squashfs
@@ -2428,6 +2426,9 @@
 %endif
 
 %changelog
+* Fri Jun 01 2007 Dave Jones <davej at redhat.com>
+- E1000: Fix netif_poll_enable crash in e1000_open.
+
 * Tue May 29 2007 Dave Jones <davej at redhat.com>
 - Reenable non-x86 architectures..
 


--- linux-2.6-net-e1000-debug-shirq.patch DELETED ---


--- linux-2.6-net-e1000-no-polling-in-open.patch DELETED ---