| From d45bdadb72b2d5f53d70f1b1499145ca4b71ad89 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Apr 2021 13:29:35 +0100 |
| Subject: sfc: ef10: fix TX queue lookup in TX event handling |
| |
| From: Edward Cree <ecree.xilinx@gmail.com> |
| |
| [ Upstream commit 172e269edfce34bac7c61c15551816bda4b0f140 ] |
| |
| We're starting from a TXQ label, not a TXQ type, so |
| efx_channel_get_tx_queue() is inappropriate. This worked by chance, |
| because labels and types currently match on EF10, but we shouldn't |
| rely on that. |
| |
| Fixes: 12804793b17c ("sfc: decouple TXQ type from label") |
| Signed-off-by: Edward Cree <ecree.xilinx@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/sfc/ef10.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c |
| index da6886dcac37..4fa72b573c17 100644 |
| --- a/drivers/net/ethernet/sfc/ef10.c |
| +++ b/drivers/net/ethernet/sfc/ef10.c |
| @@ -2928,8 +2928,7 @@ efx_ef10_handle_tx_event(struct efx_channel *channel, efx_qword_t *event) |
| |
| /* Get the transmit queue */ |
| tx_ev_q_label = EFX_QWORD_FIELD(*event, ESF_DZ_TX_QLABEL); |
| - tx_queue = efx_channel_get_tx_queue(channel, |
| - tx_ev_q_label % EFX_MAX_TXQ_PER_CHANNEL); |
| + tx_queue = channel->tx_queue + (tx_ev_q_label % EFX_MAX_TXQ_PER_CHANNEL); |
| |
| if (!tx_queue->timestamping) { |
| /* Transmit completion */ |
| -- |
| 2.30.2 |
| |
