* [PATCH] r8169 Fix hang in rtl8169_down (NAPI)
@ 2007-10-15 20:25 Markus Trippelsdorf
2007-10-15 20:53 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Markus Trippelsdorf @ 2007-10-15 20:25 UTC (permalink / raw)
To: jgarzik, netdev
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 <markus@trippelsdorf.de>
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] r8169 Fix hang in rtl8169_down (NAPI)
2007-10-15 20:25 [PATCH] r8169 Fix hang in rtl8169_down (NAPI) Markus Trippelsdorf
@ 2007-10-15 20:53 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-10-15 20:53 UTC (permalink / raw)
To: markus; +Cc: jgarzik, netdev
From: Markus Trippelsdorf <markus@trippelsdorf.de>
Date: Mon, 15 Oct 2007 22:25:46 +0200
> 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 <markus@trippelsdorf.de>
This change doesn't make any sense.
> 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()? */
If anything the test should be the other way around, use of
napi interfaces should be used when R8169_NAPI is set.
You're just papering around some other bug in the NAPI support
of this driver, which someone will need to figure out and fix
correctly.
But thanks for the report, and the patch, whilst bogus, might
provide a clue.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-15 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-15 20:25 [PATCH] r8169 Fix hang in rtl8169_down (NAPI) Markus Trippelsdorf
2007-10-15 20:53 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).