From: Russell King (Oracle) Date: Fri, 20 Mar 2026 16:47:37 +0000 (+0000) Subject: net: stmmac: elminate tbs_desc in stmmac_xmit() X-Git-Tag: v7.1-rc1~173^2~185^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd1f306e28157bd0900cae52207839d210e61f61;p=thirdparty%2Fkernel%2Flinux.git net: stmmac: elminate tbs_desc in stmmac_xmit() There is no need to have a local variable for tbs_desc, we can do the conversion when calling stmmac_set_desc_tbs(). Signed-off-by: Russell King (Oracle) Link: https://patch.msgid.link/E1w3d0b-0000000DfMD-2hrD@rmk-PC.armlinux.org.uk Tested-by: Maxime Chevallier Signed-off-by: Paolo Abeni --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index a8a18d79b6a88..9b6b493316399 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4678,7 +4678,6 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) int gso = skb_shinfo(skb)->gso_type; struct stmmac_txq_stats *txq_stats; struct dma_desc *desc, *first_desc; - struct dma_edesc *tbs_desc = NULL; struct stmmac_tx_queue *tx_q; int i, csum_insertion = 0; int entry, first_tx; @@ -4802,8 +4801,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (tx_q->tbs & STMMAC_TBS_EN) { struct timespec64 ts = ns_to_timespec64(skb->tstamp); - tbs_desc = dma_desc_to_edesc(first_desc); - stmmac_set_desc_tbs(priv, tbs_desc, ts.tv_sec, ts.tv_nsec); + stmmac_set_desc_tbs(priv, dma_desc_to_edesc(first_desc), + ts.tv_sec, ts.tv_nsec); } for (i = 0; i < nfrags; i++) {