| Message ID | 20211117152917.3739-1-alexandr.lobakin@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e92af33e472cf3aa25fd14ae7760c113f5ac8c48 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] stmmac: fix build due to brainos in trans_start changes | expand |
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>
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!
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)
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(-)