From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
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, netdev@vger.kernel.org,
Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next 4/6] net: stmmac: move stmmac_xmit() initial variable init
Date: Fri, 20 Mar 2026 16:47:27 +0000 [thread overview]
Message-ID: <E1w3d0R-0000000DfM1-1itN@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <ab15_JvLGFtUH_3x@shell.armlinux.org.uk>
Move tx_q, first_tx and txq_stats just before their first use.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d5e28ecf9fb4..95da2940cc3d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4692,10 +4692,6 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
dma_addr_t dma_addr;
u32 sdu_len;
- tx_q = &priv->dma_conf.tx_queue[queue];
- txq_stats = &priv->xstats.txq_stats[queue];
- first_tx = tx_q->cur_tx;
-
if (priv->tx_path_in_lpi_mode && priv->eee_sw_timer_en)
stmmac_stop_sw_lpi(priv);
@@ -4732,6 +4728,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}
+ tx_q = &priv->dma_conf.tx_queue[queue];
+ first_tx = tx_q->cur_tx;
+
/* Check if VLAN can be inserted by HW */
has_vlan = stmmac_vlan_insert(priv, skb, tx_q);
@@ -4889,6 +4888,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, queue));
}
+ txq_stats = &priv->xstats.txq_stats[queue];
u64_stats_update_begin(&txq_stats->q_syncp);
u64_stats_add(&txq_stats->q.tx_bytes, skb->len);
if (set_ic)
--
2.47.3
next prev parent reply other threads:[~2026-03-20 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 16:46 [PATCH net-next 0/6] net: stmmac: cleanup stmmac_xmit() Russell King (Oracle)
2026-03-20 16:47 ` [PATCH net-next 1/6] net: stmmac: move stmmac_xmit() skb head handling Russell King (Oracle)
2026-03-20 16:47 ` [PATCH net-next 2/6] net: stmmac: move first xmit descriptor SARC and TBS config Russell King (Oracle)
2026-03-20 16:47 ` [PATCH net-next 3/6] net: stmmac: move stmmac_xmit() first entry index code Russell King (Oracle)
2026-03-20 16:47 ` Russell King (Oracle) [this message]
2026-03-20 16:47 ` [PATCH net-next 5/6] net: stmmac: use first_desc for TBS Russell King (Oracle)
2026-03-20 16:47 ` [PATCH net-next 6/6] net: stmmac: elminate tbs_desc in stmmac_xmit() Russell King (Oracle)
2026-03-20 19:44 ` [PATCH net-next 0/6] net: stmmac: cleanup stmmac_xmit() Maxime Chevallier
2026-03-24 11:20 ` 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=E1w3d0R-0000000DfM1-1itN@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=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.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