Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f66b533d authored by Niklas Cassel's avatar Niklas Cassel Committed by David S. Miller
Browse files

net: stmmac: do not clear tx_skbuff entries in stmmac_xmit()/stmmac_tso_xmit() 



tx_skbuff is initialized to NULL in init_dma_tx_desc_rings(), which is
called from ndo_open().

stmmac_tx_clean() frees any non-NULL skb, and sets the tx_skbuff
entry to NULL. Hence, there is no need to set skbuff entries to NULL
in stmmac_xmit()/stmmac_tso_xmit(), and doing so falsely gives the
reader the impression that it is needed.
Do not clear tx_skbuff entries in stmmac_xmit()/stmmac_tso_xmit().

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d212a9e

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

+0 −3
Original line number Diff line number Diff line
@@ -2927,7 +2927,6 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) 


		tx_q->tx_skbuff_dma[tx_q->cur_tx].buf = des;

		tx_q->tx_skbuff_dma[tx_q->cur_tx].len = skb_frag_size(frag);

		tx_q->tx_skbuff[tx_q->cur_tx] = NULL;

		tx_q->tx_skbuff_dma[tx_q->cur_tx].map_as_page = true;

	}
@@ -3102,8 +3101,6 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (dma_mapping_error(priv->device, des))

			goto dma_map_err; /* should reuse desc w/o issues */



		tx_q->tx_skbuff[entry] = NULL;



		tx_q->tx_skbuff_dma[entry].buf = des;

		if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))

			desc->des0 = cpu_to_le32(des);