| Message ID | 1256564782-2781-1-git-send-email-anemo@mba.ocn.ne.jp |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)