diff options
| author |   Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-10-26 03:46:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-28 03:56:54 -0700 |
| commit | 02c5c8ec170a159a563e22c67f8ca111071b8e9f (patch) | |
| tree | b4305b68b7a7ad06cb260067e9d92e443f5bbeb4 | |
| parent | NET/KS8695: add support NAPI for Rx (diff) | |
| download | linux-dev-02c5c8ec170a159a563e22c67f8ca111071b8e9f.tar.xz linux-dev-02c5c8ec170a159a563e22c67f8ca111071b8e9f.zip | |
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.c | 5 |
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) 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; } |