[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070523104711.GA24332@gondor.apana.org.au>
Date: Wed, 23 May 2007 20:47:11 +1000
From: Herbert Xu <herbert@...dor.apana.org.au>
To: "Kok, Auke" <auke-jan.h.kok@...el.com>
Cc: 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 Tue, May 22, 2007 at 10:02:53AM -0700, Kok, Auke wrote:
>
> I've posted that before and it's up to the stable team. I think that it's a
> seriously toolarge change unless Herbert posts his short version of the fix
> for 2.6.21.1. I would be OK with that.
This patch should work for 2.6.21.
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