forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
c46e9907d4
commit
5b2ec6f2be
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user