From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH net-next 1/9] 8139too: use napi_complete_done() Date: Sat, 4 Feb 2017 10:20:30 -0800 Message-ID: <20170204182038.3752-2-edumazet@google.com> References: <20170204182038.3752-1-edumazet@google.com> Cc: netdev , Eric Dumazet , Eric Dumazet To: "David S . Miller" Return-path: Received: from mail-pf0-f181.google.com ([209.85.192.181]:33955 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbdBDSUy (ORCPT ); Sat, 4 Feb 2017 13:20:54 -0500 Received: by mail-pf0-f181.google.com with SMTP id e4so13495789pfg.1 for ; Sat, 04 Feb 2017 10:20:54 -0800 (PST) In-Reply-To: <20170204182038.3752-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/ethernet/realtek/8139too.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index 5ad59c6d29a46a036a6b1d70e77ae288d9fe..60e8e86d5f1317029c372b137bf96f6680b3 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -2136,15 +2136,13 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) work_done += rtl8139_rx(dev, tp, budget); if (work_done < budget) { - 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); + if (napi_complete_done(napi, work_done)) { + unsigned long flags; + + spin_lock_irqsave(&tp->lock, flags); + RTL_W16_F(IntrMask, rtl8139_intr_mask); + spin_unlock_irqrestore(&tp->lock, flags); + } } spin_unlock(&tp->rx_lock); -- 2.11.0.483.g087da7b7c-goog