* [PATCH 1/2] tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled
@ 2009-10-26 13:46 Atsushi Nemoto
2009-10-28 10:57 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Atsushi Nemoto @ 2009-10-26 13:46 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Ralf Roesch
Return received count correctly even if tx completed at the same time.
Currently NAPI is disabled for this driver so this patch does not fix
any real problem.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
drivers/net/tc35815.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d1298e5..3d38479 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1592,7 +1592,12 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status)
lp->lstats.tx_ints++;
tc35815_txdone(dev);
netif_wake_queue(dev);
+#ifdef TC35815_NAPI
+ if (ret < 0)
+ ret = 0;
+#else
ret = 0;
+#endif
}
return ret;
}
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled
2009-10-26 13:46 [PATCH 1/2] tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled Atsushi Nemoto
@ 2009-10-28 10:57 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-10-28 10:57 UTC (permalink / raw)
To: anemo; +Cc: netdev, ralf.roesch
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Mon, 26 Oct 2009 22:46:21 +0900
> Return received count correctly even if tx completed at the same time.
> Currently NAPI is disabled for this driver so this patch does not fix
> any real problem.
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-28 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-26 13:46 [PATCH 1/2] tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled Atsushi Nemoto
2009-10-28 10:57 ` 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).