From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next 4/5] net: stmmac: rearrange tc_init()
Date: Wed, 15 Oct 2025 17:10:56 +0100 [thread overview]
Message-ID: <E1v945Y-0000000Ameb-2gDI@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <aO_HIwT_YvxkDS8D@shell.armlinux.org.uk>
To make future changes easier, rearrange the use of dma_cap->l3l4fnum
vs priv->flow_entries_max.
Always initialise priv->flow_entries_max from dma_cap->l3l4fnum, then
use priv->flow_entries_max to determine whether we allocate
priv->flow_entries and set it up.
This change is safe because tc_init() is only called once from
stmmac_dvr_probe().
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index 97e89a604abd..ef65cf511f3e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -262,10 +262,10 @@ static int tc_init(struct stmmac_priv *priv)
unsigned int count;
int ret, i;
- if (dma_cap->l3l4fnum) {
- priv->flow_entries_max = dma_cap->l3l4fnum;
+ priv->flow_entries_max = dma_cap->l3l4fnum;
+ if (priv->flow_entries_max) {
priv->flow_entries = devm_kcalloc(priv->device,
- dma_cap->l3l4fnum,
+ priv->flow_entries_max,
sizeof(*priv->flow_entries),
GFP_KERNEL);
if (!priv->flow_entries)
--
2.47.3
next prev parent reply other threads:[~2025-10-15 16:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-15 16:09 [PATCH net-next 0/5] net: stmmac: more cleanups Russell King (Oracle)
2025-10-15 16:10 ` [PATCH net-next 1/5] net: stmmac: dwc-qos-eth: move MDIO bus locking into stmmac_mdio Russell King (Oracle)
2025-10-16 7:03 ` Maxime Chevallier
2025-10-16 20:13 ` Andrew Lunn
2025-10-15 16:10 ` [PATCH net-next 2/5] net: stmmac: place .mac_finish() method more appropriately Russell King (Oracle)
2025-10-16 7:06 ` Maxime Chevallier
2025-10-16 20:15 ` Andrew Lunn
2025-10-15 16:10 ` [PATCH net-next 3/5] net: stmmac: avoid PHY speed change when configuring MTU Russell King (Oracle)
2025-10-16 7:22 ` Maxime Chevallier
2025-10-16 7:44 ` [Linux-stm32] " Gatien CHEVALLIER
2025-10-16 20:16 ` Andrew Lunn
2025-10-15 16:10 ` Russell King (Oracle) [this message]
2025-10-16 7:25 ` [PATCH net-next 4/5] net: stmmac: rearrange tc_init() Maxime Chevallier
2025-10-15 16:11 ` [PATCH net-next 5/5] net: stmmac: rename stmmac_phy_setup() to include phylink Russell King (Oracle)
2025-10-16 7:26 ` Maxime Chevallier
2025-10-16 7:37 ` [Linux-stm32] " Gatien CHEVALLIER
2025-10-16 20:23 ` Andrew Lunn
2025-10-16 23:10 ` [PATCH net-next 0/5] net: stmmac: more cleanups patchwork-bot+netdevbpf
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=E1v945Y-0000000Ameb-2gDI@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).