From: Chris Wright Date: Thu, 24 May 2007 04:30:47 +0000 (-0700) Subject: e1000 netpoll fix X-Git-Tag: v2.6.20.12~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad95a3b958c966f1a99304e0542c7cb29c71f7be;p=thirdparty%2Fkernel%2Fstable-queue.git e1000 netpoll fix --- diff --git a/queue-2.6.21/e1000-fix-netif_poll_enable-crash-in-e1000_open.patch b/queue-2.6.21/e1000-fix-netif_poll_enable-crash-in-e1000_open.patch new file mode 100644 index 00000000000..ebf7a77258d --- /dev/null +++ b/queue-2.6.21/e1000-fix-netif_poll_enable-crash-in-e1000_open.patch @@ -0,0 +1,33 @@ +From herbert@gondor.apana.org.au Wed May 23 18:29:38 2007 +Date: Thu, 24 May 2007 11:29:21 +1000 +Message-ID: <20070524012921.GA2943@gondor.apana.org.au> +From: Herbert Xu +To: Chris Wright +Cc: auke-jan.h.kok@intel.com, cebbert@redhat.com, jeff@garzik.org, stable@kernel.org, greg@kroah.com, e1000-devel@lists.sourceforge.net, davej@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 +Acked-by: Auke Kok +Signed-off-by: Chris Wright + +--- + drivers/net/e1000/e1000_main.c | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.21.2.orig/drivers/net/e1000/e1000_main.c ++++ linux-2.6.21.2/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; diff --git a/queue-2.6.21/series b/queue-2.6.21/series index b964c54078a..880040c6ff9 100644 --- a/queue-2.6.21/series +++ b/queue-2.6.21/series @@ -11,3 +11,4 @@ alsa-hda-intel-probe-additional-slots-only-if-necessary.patch alsa-hda-intel-fix-detection-of-audio-codec-on-toshiba-a100.patch char-cyclades-fix-deadlock.patch hpt366-don-t-check-enablebits-for-hpt36x.patch +e1000-fix-netif_poll_enable-crash-in-e1000_open.patch