* [PATCH net-next] stmmac: fix build due to brainos in trans_start changes
@ 2021-11-17 15:29 Alexander Lobakin
2021-11-17 15:59 ` Eric Dumazet
2021-11-17 16:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Alexander Lobakin @ 2021-11-17 15:29 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Alexander Lobakin, Eric Dumazet, Giuseppe Cavallaro,
Alexandre Torgue, Jose Abreu, Maxime Coquelin, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] stmmac: fix build due to brainos in trans_start changes
2021-11-17 15:29 [PATCH net-next] stmmac: fix build due to brainos in trans_start changes Alexander Lobakin
@ 2021-11-17 15:59 ` Eric Dumazet
2021-11-17 16:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2021-11-17 15:59 UTC (permalink / raw)
To: Alexander Lobakin
Cc: David S. Miller, Jakub Kicinski, Giuseppe Cavallaro,
Alexandre Torgue, Jose Abreu, Maxime Coquelin, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
On Wed, Nov 17, 2021 at 7:29 AM Alexander Lobakin
<alexandr.lobakin@intel.com> 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 <alexandr.lobakin@intel.com>
> ---
Thanks !
Reviewed-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] stmmac: fix build due to brainos in trans_start changes
2021-11-17 15:29 [PATCH net-next] stmmac: fix build due to brainos in trans_start changes Alexander Lobakin
2021-11-17 15:59 ` Eric Dumazet
@ 2021-11-17 16:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-11-17 16:30 UTC (permalink / raw)
To: Alexander Lobakin
Cc: davem, kuba, edumazet, peppe.cavallaro, alexandre.torgue, joabreu,
mcoquelin.stm32, netdev, linux-stm32, linux-arm-kernel,
linux-kernel
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
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 <alexandr.lobakin@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-17 16:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-17 15:29 [PATCH net-next] stmmac: fix build due to brainos in trans_start changes Alexander Lobakin
2021-11-17 15:59 ` Eric Dumazet
2021-11-17 16:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox