Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: davem@davemloft.net
Cc: kuba@kernel.org, netdev@vger.kernel.org,
	martin.blumenstingl@googlemail.com,
	Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 3/3] net: lantiq: Use napi_complete_done()
Date: Sat, 15 Aug 2020 20:33:14 +0200	[thread overview]
Message-ID: <20200815183314.404-3-hauke@hauke-m.de> (raw)
In-Reply-To: <20200815183314.404-1-hauke@hauke-m.de>

Use napi_complete_done() and activate the interrupts when this function
returns true. This way the generic NAPI code can take care of activating
the interrupts.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/net/ethernet/lantiq_xrx200.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c
index f34e4dc8c661..674ffb2ecd9a 100644
--- a/drivers/net/ethernet/lantiq_xrx200.c
+++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -229,10 +229,8 @@ static int xrx200_poll_rx(struct napi_struct *napi, int budget)
 		}
 	}
 
-	if (rx < budget) {
-		napi_complete(&ch->napi);
+	if (napi_complete_done(&ch->napi, rx))
 		ltq_dma_enable_irq(&ch->dma);
-	}
 
 	return rx;
 }
@@ -271,10 +269,8 @@ static int xrx200_tx_housekeeping(struct napi_struct *napi, int budget)
 	if (netif_queue_stopped(net_dev))
 		netif_wake_queue(net_dev);
 
-	if (pkts < budget) {
-		napi_complete(&ch->napi);
+	if (napi_complete_done(&ch->napi, pkts))
 		ltq_dma_enable_irq(&ch->dma);
-	}
 
 	return pkts;
 }
-- 
2.20.1


  parent reply	other threads:[~2020-08-15 22:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-15 18:33 [PATCH 1/3] net: lantiq: Wake TX queue again Hauke Mehrtens
2020-08-15 18:33 ` [PATCH 2/3] net: lantiq: use netif_tx_napi_add() for TX NAPI Hauke Mehrtens
2020-08-16 18:05   ` Eric Dumazet
2020-08-15 18:33 ` Hauke Mehrtens [this message]
2020-08-16 18:07   ` [PATCH 3/3] net: lantiq: Use napi_complete_done() Eric Dumazet
2020-08-17 21:17     ` Hauke Mehrtens
2020-08-18  0:33       ` Eric Dumazet
2020-08-18  0:48         ` Eric Dumazet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200815183314.404-3-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH 3/3] net: lantiq: Use napi_complete_done()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).