From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C916D39C623 for ; Fri, 8 May 2026 22:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778278446; cv=none; b=A16y219izI9IXT1w9tP+TLMLtOnGNTgjKgyHmaLyAFQpYmE3fvMTDZGUI7zKhJp5QU64oRTKpudoa5bBNapkl1++joFFrVoBlZFnDXFBWswS0lUWUtUQsIGi/hikuvcl7J9J8tlQvSCj098ZeLTtqa6T71eBvZWOVhVGKIbVO30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778278446; c=relaxed/simple; bh=5Ch8ZOqtaX18MwHimx7dw9BnERZbw1QWYyj/akybK0s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rotBk6Zl9HU9kW64tUWKGe/hafyltaVZZcAQhkuxE2dTPzt3tpqWpMhkx14Flzu7YbGQgfK376lCQIwTFFHW1BXlbuWVrXLZxKbtxBTKHNa/zXkBuPQR1uKXmjdEObhvxUUSZNkEELnox3WGUVZR1/bbOnelvVRntXRE/YTVp9o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ArSQhsOC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ArSQhsOC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55A2FC2BCB4; Fri, 8 May 2026 22:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778278444; bh=5Ch8ZOqtaX18MwHimx7dw9BnERZbw1QWYyj/akybK0s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ArSQhsOC6cD6URVOQIhCN3f6LV6Kt4XAVBSpNtXVowVyCHecANbSzqLv6GJnVe+W+ XoQRfOpY00LTcH0G0b88DmlFYJzx3RCXXiXjaaVo5+fDt6YPFdIB4KC7H3SLcq+M50 asl0MqdplO+aykbrKjirzrUWHD63kpNToHHzCCD5tOjw6h6DXaESX3xMJHVsFe0H6s qAmTs3ZS7Sgu995Quh9pWTKTAbdEq53SoX3F1HdCkV2gxWELZZEo+a2rDhsaL/d2Ax apeButTEJb7iQpn07ZjtcuaACIPavN0pr8PWSkFkfRa3ObKWUfTRx14oWfwp9/pYQ/ mvCUJMJNh72Jg== From: Linus Walleij Date: Sat, 09 May 2026 00:13:39 +0200 Subject: [PATCH net 4/4] net: ethernet: cortina: Fix budget accounting Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260509-gemini-ethernet-fixes-v1-4-6c5d20ddc35b@kernel.org> References: <20260509-gemini-ethernet-fixes-v1-0-6c5d20ddc35b@kernel.org> In-Reply-To: <20260509-gemini-ethernet-fixes-v1-0-6c5d20ddc35b@kernel.org> To: Andreas Haarmann-Thiemann , Hans Ulli Kroll , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?q?Micha=C5=82_Miros=C5=82aw?= Cc: netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.15.2 The gmac_rx() function should return the number of packets received, not the remaining budget, as it currently does. In gmac_napi_poll(), this return value is assigned to received, and if received < budget, the driver calls napi_complete_done(napi, received). Fix this by adding a new local variable for the number of received packets in gmac_rx() and return that instead. This was found by Sashiko during normal patch review. Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Link: https://sashiko.dev/#/patchset/20260505-gemini-ethernet-fix-v2-1-997c31d06079%40kernel.org Signed-off-by: Linus Walleij --- drivers/net/ethernet/cortina/gemini.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 4c762229ce42..5839e00aa649 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1450,6 +1450,7 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) unsigned int frame_len, frag_len; struct gmac_rxdesc *rx = NULL; struct gmac_queue_page *gpage; + unsigned int received = 0; union gmac_rxdesc_0 word0; union gmac_rxdesc_1 word1; union gmac_rxdesc_3 word3; @@ -1545,7 +1546,8 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) napi_gro_frags(&port->napi); skb = NULL; frag_nr = 0; - --budget; + budget--; + received++; } continue; @@ -1565,7 +1567,7 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) port->rx_skb = skb; port->rx_frag_nr = frag_nr; writew(r, ptr_reg); - return budget; + return received; } static int gmac_napi_poll(struct napi_struct *napi, int budget) -- 2.54.0