diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-30 08:22:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-30 15:10:42 -0500 |
| commit | 6ad20165d376fa07919a70e4f43dfae564601829 (patch) | |
| tree | d5cc7d8d041321af6ea83b053bedd47a73e639fb /drivers/net/ethernet/toshiba | |
| parent | 63a6fff353d01da5a22b72670c434bf12fa0e3b8 (diff) | |
| download | linux-6ad20165d376fa07919a70e4f43dfae564601829.tar.gz linux-6ad20165d376fa07919a70e4f43dfae564601829.tar.bz2 linux-6ad20165d376fa07919a70e4f43dfae564601829.zip | |
drivers: net: generalize napi_complete_done()
napi_complete_done() allows to opt-in for gro_flush_timeout,
added back in linux-3.19, commit 3b47d30396ba
("net: gro: add a per device gro flush timer")
This allows for more efficient GRO aggregation without
sacrifying latencies.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/toshiba')
| -rw-r--r-- | drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/toshiba/spider_net.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/toshiba/tc35815.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index 345316c749e7..72013314bba8 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c @@ -1109,7 +1109,7 @@ static int gelic_net_poll(struct napi_struct *napi, int budget) } if (packets_done < budget) { - napi_complete(napi); + napi_complete_done(napi, packets_done); gelic_card_rx_irq_on(card); } return packets_done; diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index cb341dfe65ad..cec9e70ab995 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c @@ -1270,7 +1270,7 @@ static int spider_net_poll(struct napi_struct *napi, int budget) /* if all packets are in the stack, enable interrupts and return 0 */ /* if not, return 1 */ if (packets_done < budget) { - napi_complete(napi); + napi_complete_done(napi, packets_done); spider_net_rx_irq_on(card); card->ignore_rx_ramfull = 0; } diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index 3be61ed28741..a45f98fa4aa7 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c @@ -1638,7 +1638,7 @@ static int tc35815_poll(struct napi_struct *napi, int budget) spin_unlock(&lp->rx_lock); if (received < budget) { - napi_complete(napi); + napi_complete_done(napi, received); /* enable interrupts */ tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl); } |