[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070524012921.GA2943@gondor.apana.org.au>
Date: Thu, 24 May 2007 11:29:21 +1000
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Chris Wright <chrisw@...s-sol.org>
Cc: "Kok, Auke" <auke-jan.h.kok@...el.com>,
Chuck Ebbert <cebbert@...hat.com>,
Jeff Garzik <jeff@...zik.org>, stable@...nel.org,
Greg KH <greg@...ah.com>, e1000-devel@...ts.sourceforge.net,
netdev@...r.kernel.org, davej@...hat.com
Subject: Re: [PATCH] e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1)
On Wed, May 23, 2007 at 04:34:18PM -0700, Chris Wright wrote:
>
> Mind adding an updated changelog and signed-off-by please?
Sure.
[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@...dor.apana.org.au>
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index b28a915..1e4e722 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists