From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (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 CC05934D909; Sat, 14 Mar 2026 09:43:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773481407; cv=none; b=XZtMZLf5fMM3BhGWWRGserD9SMA8Sh+hb4xKVZjeML4s7/KtLHS8biWwVQ8TCbTZIgWrqbP7BOwkeX2FXIWtzlSNz7ZJcpGv/Udrivu10gtxu+Ad1qhTSQzFt9rFMWDLse0fhAwZK0pb1zFhtRJ02hBeRov2jUmaWkLDjoHurOM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773481407; c=relaxed/simple; bh=PZdHvMr7wL9hFfOIrhq7tR38Vzwj6L2pUcXErWIwcDI=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=p8nvMbydPECD43xDexJpVgxTV7/RA7oGiqFYFT0PnBXqquucf5FPzmaJ/XdCYGrl9IvYbNTvuh+ziG45x882OESlZEjJYuDz7/t3xVj72XegHvgKA7S0eKU1q8oBinv4bPS7Iwvff/Ks6sXt/4iGe+pYz0P+533xPgYD/ecKIIQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=LLMEwZAH; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="LLMEwZAH" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mN5vxj18DEG/GzsK/ZAK4TM2Y4zdJSMNto0z0SCK1Fo=; b=LLMEwZAHVPcQvTvS4s2Zq0sj4R 5BdvchgG/aWElA2Fg0IBJFrr0lIs+Z4cwaOnqkiQDqLT+//o7BQM5wViX/ZwmaT7ikqkc8bK6zU0Q lJYzTf4f1R1kcz/BaeEVNFGBtsApNlyyFlz+BEkolTrqG+iOPHkS3t44I7WdNftI0zQ/h/ch1l6BM kLSbjUwH315551QDQiuQBzausnGQAYBsbyZWOOBpall0CGjj38W46PHST3qtMyh2xr0+y5jEFtJey AmlSa5X0EwfBC6+IFpTpXXItIl0wClN4S6gU5Ju2HUbop1beUkSYvjHPMFUhsnmAZFnubyXb01TvK EzxTZGOA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:38348 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1w1LWc-0000000022L-06b5; Sat, 14 Mar 2026 09:43:14 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1w1LWY-0000000DGSd-49H6; Sat, 14 Mar 2026 09:43:11 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn Cc: Alexandre Torgue , Alexei Starovoitov , Andrew Lunn , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jesper Dangaard Brouer , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, Paolo Abeni , Stanislav Fomichev Subject: [PATCH net-next v4 10/15] net: stmmac: simplify stmmac_set_queue_rx_buf_size() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Sat, 14 Mar 2026 09:43:10 +0000 Clean up the new stmmac_set_queue_rx_buf_size() to simplify the code. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 47b536c15c0e..032ef9fba8b4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -399,16 +399,12 @@ static void stmmac_set_queue_rx_buf_size(struct stmmac_priv *priv, { u32 buf_size; - if (rx_q->xsk_pool && rx_q->buf_alloc_num) { + if (rx_q->xsk_pool && rx_q->buf_alloc_num) buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool); - stmmac_set_dma_bfsize(priv, priv->ioaddr, - buf_size, - rx_q->queue_index); - } else { - stmmac_set_dma_bfsize(priv, priv->ioaddr, - priv->dma_conf.dma_buf_sz, - rx_q->queue_index); - } + else + buf_size = priv->dma_conf.dma_buf_sz; + + stmmac_set_dma_bfsize(priv, priv->ioaddr, buf_size, rx_q->queue_index); } /** -- 2.47.3