Skip to content

Commit 617f012

Browse files
edumazetdavem330
authored andcommitted
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>
1 parent 3976001 commit 617f012

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/net/ethernet/realtek/8139too.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,14 +2135,10 @@ static int rtl8139_poll(struct napi_struct *napi, int budget)
21352135
if (likely(RTL_R16(IntrStatus) & RxAckBits))
21362136
work_done += rtl8139_rx(dev, tp, budget);
21372137

2138-
if (work_done < budget) {
2138+
if (work_done < budget && napi_complete_done(napi, work_done)) {
21392139
unsigned long flags;
2140-
/*
2141-
* Order is important since data can get interrupted
2142-
* again when we think we are done.
2143-
*/
2140+
21442141
spin_lock_irqsave(&tp->lock, flags);
2145-
__napi_complete(napi);
21462142
RTL_W16_F(IntrMask, rtl8139_intr_mask);
21472143
spin_unlock_irqrestore(&tp->lock, flags);
21482144
}

0 commit comments

Comments
 (0)