Re: rmmod e1000 hangs (Was Re: 2.6.22-rc2-mm1)

[Herbert Xu <herbert@gondor.apana.org.au>]

On Fri, May 25, 2007 at 10:54:13PM +1000, Herbert Xu wrote:
> 
> So please revert my patch.
> 
> We need to find out why we're getting IRQs before calling
> e1000_irq_enable in e1000_open.

In the mean time this should be a safe fix.  This is against
the current mainline tree.

[E1000]: Call netif_poll_enable in e1000_open

This restores the previously removed netif_poll_enable call in
e1000_open.  It's needed on all but the first call to e1000_open
for a NIC as e1000_close always calls netif_poll_disable.

netif_poll_enable can only be called safely if no polls have been
scheduled.  This should be the case as long as we don't enter our
IRQ handler.  Just in case someone has left IRQs enabled, we call
this before the IRQ handler is installed.

Of course we should really make sure that IRQs are disabled as
early as possible, i.e., when we're still in the probe routine.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.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 cbc7feb..d91a378 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1424,6 +1424,10 @@ e1000_open(struct net_device *netdev)
 	 * clean_rx handler before we do so.  */
 	e1000_configure(adapter);
 
+#ifdef CONFIG_E1000_NAPI
+	netif_poll_enable(netdev);
+#endif
+
 	err = e1000_request_irq(adapter);
 	if (err)
 		goto err_req_irq;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/