aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2009-10-25 23:46:21 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-28 06:56:54 -0400
commit02c5c8ec170a159a563e22c67f8ca111071b8e9f (patch)
treeb4305b68b7a7ad06cb260067e9d92e443f5bbeb4
parent31b73ab3efaa9c69bc72e04605c85ff8c8047b11 (diff)
tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tc35815.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d1298e5b72c5..3d3847904c00 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)
1592 lp->lstats.tx_ints++; 1592 lp->lstats.tx_ints++;
1593 tc35815_txdone(dev); 1593 tc35815_txdone(dev);
1594 netif_wake_queue(dev); 1594 netif_wake_queue(dev);
1595#ifdef TC35815_NAPI
1596 if (ret < 0)
1597 ret = 0;
1598#else
1595 ret = 0; 1599 ret = 0;
1600#endif
1596 } 1601 }
1597 return ret; 1602 return ret;
1598} 1603}