Patch "wifi: rtw89: fix timeout calculation in rtw89_roc_end()" has been added to the 6.6-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    wifi: rtw89: fix timeout calculation in rtw89_roc_end()

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     wifi-rtw89-fix-timeout-calculation-in-rtw89_roc_end.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 212e93267ced36db729018689c505885548fe400
Author: Dmitry Antipov <dmantipov@xxxxxxxxx>
Date:   Tue Oct 24 17:31:33 2023 +0300

    wifi: rtw89: fix timeout calculation in rtw89_roc_end()
    
    [ Upstream commit e416514e309f7e25e577fee45a65f246f67b2261 ]
    
    Since 'rtw89_core_tx_kick_off_and_wait()' assumes timeout
    (actually RTW89_ROC_TX_TIMEOUT) in milliseconds, I suppose
    that RTW89_ROC_IDLE_TIMEOUT is in milliseconds as well. If
    so, 'msecs_to_jiffies()' should be used in a call to
    'ieee80211_queue_delayed_work()' from 'rtw89_roc_end()'.
    Compile tested only.
    
    Signed-off-by: Dmitry Antipov <dmantipov@xxxxxxxxx>
    Acked-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
    Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20231024143137.30393-1-dmantipov@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 133bf289bacb..535393eca564 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -2548,7 +2548,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
 
 	if (hw->conf.flags & IEEE80211_CONF_IDLE)
 		ieee80211_queue_delayed_work(hw, &roc->roc_work,
-					     RTW89_ROC_IDLE_TIMEOUT);
+					     msecs_to_jiffies(RTW89_ROC_IDLE_TIMEOUT));
 }
 
 void rtw89_roc_work(struct work_struct *work)




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux