Commit e92af33e authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Jakub Kicinski
Browse files

stmmac: fix build due to brainos in trans_start changes 



txq_trans_cond_update() takes netdev_tx_queue *nq,
not nq->trans_start.

Fixes: 5337824f ("net: annotate accesses to queue->trans_start")
Signed-off-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20211117152917.3739-1-alexandr.lobakin@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 17a7555b

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

+2 −2
Original line number Diff line number Diff line
@@ -2356,7 +2356,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget) 
	bool work_done = true;



	/* Avoids TX time-out as we are sharing with slow path */

	txq_trans_cond_update(nq->trans_start);

	txq_trans_cond_update(nq);



	budget = min(budget, stmmac_tx_avail(priv, queue));
@@ -4657,7 +4657,7 @@ static int stmmac_xdp_xmit_back(struct stmmac_priv *priv, 


	__netif_tx_lock(nq, cpu);

	/* Avoids TX time-out as we are sharing with slow path */

	txq_trans_cond_update(nq->trans_start);

	txq_trans_cond_update(nq);



	res = stmmac_xdp_xmit_xdpf(priv, queue, xdpf, false);

	if (res == STMMAC_XDP_TX)