[PATCH net 2/3] sfc: farch: fix TX queue lookup in TX event handling

[Edward Cree]

We're starting from a TXQ label, not a TXQ type, so
 efx_channel_get_tx_queue() is inappropriate (and could return NULL,
 leading to panics).

Fixes: 12804793b17c ("sfc: decouple TXQ type from label")
Cc: sta...@vger.kernel.org
Signed-off-by: Edward Cree <ecree.xil...@gmail.com>
---
 drivers/net/ethernet/sfc/farch.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index f89ebe0073dd..49df02ecee91 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -835,14 +835,14 @@ static void efx_farch_magic_event(struct efx_channel 
*channel, u32 magic)
                /* Transmit completion */
                tx_ev_desc_ptr = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_DESC_PTR);
                tx_ev_q_label = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_Q_LABEL);
-               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);
                efx_xmit_done(tx_queue, tx_ev_desc_ptr);
        } else if (EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_WQ_FF_FULL)) {
                /* Rewrite the FIFO write pointer */
                tx_ev_q_label = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_Q_LABEL);
-               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);
 
                netif_tx_lock(efx->net_dev);
                efx_farch_notify_tx_desc(tx_queue);
-- 
1.8.3.1