From: Alexander Lobakin Date: Wed, 17 Nov 2021 15:29:17 +0000 (+0100) Subject: stmmac: fix build due to brainos in trans_start changes X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e92af33e472cf3aa25fd14ae7760c113f5ac8c48;p=linux.git stmmac: fix build due to brainos in trans_start changes txq_trans_cond_update() takes netdev_tx_queue *nq, not nq->trans_start. Fixes: 5337824f4dc4 ("net: annotate accesses to queue->trans_start") Signed-off-by: Alexander Lobakin Reviewed-by: Eric Dumazet Link: https://lore.kernel.org/r/20211117152917.3739-1-alexandr.lobakin@intel.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 389d125310c15..41e9d8838f05e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -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)