]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: rtw88: fix wrong pci_get_drvdata type in AER handlers
authorChin-Yen Lee <timlee@realtek.com>
Mon, 13 Apr 2026 06:59:26 +0000 (14:59 +0800)
committerPing-Ke Shih <pkshih@realtek.com>
Wed, 29 Apr 2026 02:57:14 +0000 (10:57 +0800)
rtw88 stores an ieee80211_hw pointer via pci_set_drvdata() at probe
time, but io_error_detected() and io_resume() retrieve it as a
net_device pointer.  This causes netif_device_detach/attach to
operate on an ieee80211_hw struct, reading and writing at wrong
offsets.

Use ieee80211_stop_queues/wake_queues instead, consistent with
every other queue stop/start path in the driver.

Fixes: cdb82c80b934 ("wifi: rtw88: pci: add PCI Express error handling")
Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20260413065926.17027-1-pkshih@realtek.com
drivers/net/wireless/realtek/rtw88/pci.c

index bba370ad510cf71358a0bed2c17612dcf44fc2c3..c56beacbb1b03f025e5204fb13d486f62cffcce1 100644 (file)
@@ -1711,9 +1711,9 @@ static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev)
 static pci_ers_result_t rtw_pci_io_err_detected(struct pci_dev *pdev,
                                                pci_channel_state_t state)
 {
-       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 
-       netif_device_detach(netdev);
+       ieee80211_stop_queues(hw);
 
        return PCI_ERS_RESULT_NEED_RESET;
 }
@@ -1730,12 +1730,12 @@ static pci_ers_result_t rtw_pci_io_slot_reset(struct pci_dev *pdev)
 
 static void rtw_pci_io_resume(struct pci_dev *pdev)
 {
-       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 
        /* ack any pending wake events, disable PME */
        pci_enable_wake(pdev, PCI_D0, 0);
 
-       netif_device_attach(netdev);
+       ieee80211_wake_queues(hw);
 }
 
 const struct pci_error_handlers rtw_pci_err_handler = {