wifi: rtw88: usb: Set qsel correctly

BugLink: https://bugs.launchpad.net/bugs/2009358
commit 7869b834fb07c79933229840c98b02bbb7bd0d75 upstream.

We have to extract qsel from the skb before doing skb_push() on it,
otherwise qsel will always be 0.

Fixes: a82dfd33d1237 ("wifi: rtw88: Add common USB chip support")
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230210111632.1985205-2-s.hauer@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
index 4ef38279b64c9224ee927f66c120ff91c1327b7a..d9e995544e405645dce50c700e762431012ee256 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/usb.c
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
@@ -471,9 +471,9 @@ static int rtw_usb_tx_write(struct rtw_dev *rtwdev,
        u8 *pkt_desc;
        int ep;
 
+       pkt_info->qsel = rtw_usb_tx_queue_mapping_to_qsel(skb);
        pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz);
        memset(pkt_desc, 0, chip->tx_pkt_desc_sz);
-       pkt_info->qsel = rtw_usb_tx_queue_mapping_to_qsel(skb);
        ep = qsel_to_ep(rtwusb, pkt_info->qsel);
        rtw_tx_fill_tx_desc(pkt_info, skb);
        rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data);