commit bea3348eef27e6044b6161fd04c3152215f96411 :
[NET]: Make NAPI polling independent of struct net_device objects.
causes my machine to hang on shutdown. The following patch fixes the
problem for me.
Signed-off-by: Markus Trippelsdorf <[EMAIL PROTECTED]>
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 419c00c..2cddbf8 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2888,10 +2888,12 @@ core_down:
synchronize_irq(dev->irq);
+#ifdef CONFIG_R8169_NAPI
if (!poll_locked) {
napi_disable(&tp->napi);
poll_locked++;
}
+#endif
/* Give a racing hard_start_xmit a few cycles to complete. */
synchronize_sched(); /* FIXME: should this be synchronize_irq()? */
--
Markus
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
