diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-04 15:24:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-05 16:11:57 -0500 |
| commit | 5b2ec6f2be512485cb9fde7eb1119279af524c28 (patch) | |
| tree | 9e3aabac7395f69edc4c05f5de9400fe336cd55f /drivers/net/ethernet/amd | |
| parent | c46e9907d4dcc2062f742d4e37e41a81a162fe7b (diff) | |
| download | linux-5b2ec6f2be512485cb9fde7eb1119279af524c28.tar.gz linux-5b2ec6f2be512485cb9fde7eb1119279af524c28.tar.bz2 linux-5b2ec6f2be512485cb9fde7eb1119279af524c28.zip | |
pcnet32: 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/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index 41e58cca8fee..a8a22c0d688a 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1350,13 +1350,8 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) pcnet32_restart(dev, CSR0_START); netif_wake_queue(dev); } - spin_unlock_irqrestore(&lp->lock, flags); - - if (work_done < budget) { - spin_lock_irqsave(&lp->lock, flags); - - __napi_complete(napi); + if (work_done < budget && napi_complete_done(napi, work_done)) { /* clear interrupt masks */ val = lp->a->read_csr(ioaddr, CSR3); val &= 0x00ff; @@ -1364,9 +1359,9 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) /* Set interrupt enable. */ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN); - - spin_unlock_irqrestore(&lp->lock, flags); } + + spin_unlock_irqrestore(&lp->lock, flags); return work_done; } |