OSDN Git Service

stmmac: fix build due to brainos in trans_start changes
authorAlexander Lobakin <alexandr.lobakin@intel.com>
Wed, 17 Nov 2021 15:29:17 +0000 (16:29 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 17 Nov 2021 16:16:07 +0000 (08:16 -0800)
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 <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>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 389d125..41e9d88 100644 (file)
@@ -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)