Skip to content

Commit e92af33

Browse files
alobakinkuba-moo
authored andcommitted
stmmac: fix build due to brainos in trans_start changes
txq_trans_cond_update() takes netdev_tx_queue *nq, not nq->trans_start. Fixes: 5337824 ("net: annotate accesses to queue->trans_start") Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20211117152917.3739-1-alexandr.lobakin@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 17a7555 commit e92af33

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,7 +2356,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
23562356
bool work_done = true;
23572357

23582358
/* Avoids TX time-out as we are sharing with slow path */
2359-
txq_trans_cond_update(nq->trans_start);
2359+
txq_trans_cond_update(nq);
23602360

23612361
budget = min(budget, stmmac_tx_avail(priv, queue));
23622362

@@ -4657,7 +4657,7 @@ static int stmmac_xdp_xmit_back(struct stmmac_priv *priv,
46574657

46584658
__netif_tx_lock(nq, cpu);
46594659
/* Avoids TX time-out as we are sharing with slow path */
4660-
txq_trans_cond_update(nq->trans_start);
4660+
txq_trans_cond_update(nq);
46614661

46624662
res = stmmac_xdp_xmit_xdpf(priv, queue, xdpf, false);
46634663
if (res == STMMAC_XDP_TX)

0 commit comments

Comments
 (0)