diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-02-04 15:24:51 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-05 16:11:57 -0500 |
| commit | 617f01211bafed65b5cb2fa5b671e839c7f2af86 (patch) | |
| tree | fe5a66293642fd8c2a42c90e5a3aeb34826a06bf /drivers/net/ethernet/realtek/8139too.c | |
| parent | Merge branch 'ipv6-Improve-user-experience-with-multipath-routes' (diff) | |
| download | linux-dev-617f01211bafed65b5cb2fa5b671e839c7f2af86.tar.xz linux-dev-617f01211bafed65b5cb2fa5b671e839c7f2af86.zip | |
8139too: use napi_complete_done()
Use napi_complete_done() instead of __napi_complete() to :
1) Get support of gro_flush_timeout if opt-in
2) Not rearm interrupts for busy-polling users.
3) use standard NAPI API.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/8139too.c')
| -rw-r--r-- | drivers/net/ethernet/realtek/8139too.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index 5ad59c6d29a4..89631753e799 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -2135,14 +2135,10 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) if (likely(RTL_R16(IntrStatus) & RxAckBits)) work_done += rtl8139_rx(dev, tp, budget); - if (work_done < budget) { + if (work_done < budget && napi_complete_done(napi, work_done)) { unsigned long flags; - /* - * Order is important since data can get interrupted - * again when we think we are done. - */ + spin_lock_irqsave(&tp->lock, flags); - __napi_complete(napi); RTL_W16_F(IntrMask, rtl8139_intr_mask); spin_unlock_irqrestore(&tp->lock, flags); } |