2021-11-17 15:29:42

by Alexander Lobakin

Subject: [PATCH net-next] 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 <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 389d125310c1..41e9d8838f05 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)
--
2.33.1

2021-11-17 16:00:09

by Eric Dumazet

Subject: Re: [PATCH net-next] stmmac: fix build due to brainos in trans_start changes

On Wed, Nov 17, 2021 at 7:29 AM Alexander Lobakin
<[email protected]> wrote:
>
> 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 <[email protected]>
> ---

Thanks !

Reviewed-by: Eric Dumazet <[email protected]>

2021-11-17 16:30:11

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] stmmac: fix build due to brainos in trans_start changes

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:

On Wed, 17 Nov 2021 16:29:17 +0100 you wrote:
> 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 <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
- [net-next] stmmac: fix build due to brainos in trans_start changes
https://git.kernel.org/netdev/net-next/c/e92af33e472c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html