Commit cd1f306e authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Paolo Abeni
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w3d0b-0000000DfMD-2hrD@rmk-PC.armlinux.org.uk


Tested-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 557ccd54

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+2 −3
Original line number Diff line number Diff line
@@ -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++) {