mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 18:12:25 -04:00
rtw88: change idle mode condition during hw_scan
Previously we only consider single interface's status, idle mode behavior could be unexpected when multiple interfaces is active. Change to enter/leave idle mode by mac80211's configuration state. Signed-off-by: Po-Hao Huang <phhuang@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/20220318034316.40720-1-pkshih@realtek.com
This commit is contained in:
@@ -280,7 +280,8 @@ static void rtw_ips_work(struct work_struct *work)
|
||||
struct rtw_dev *rtwdev = container_of(work, struct rtw_dev, ips_work);
|
||||
|
||||
mutex_lock(&rtwdev->mutex);
|
||||
rtw_enter_ips(rtwdev);
|
||||
if (rtwdev->hw->conf.flags & IEEE80211_CONF_IDLE)
|
||||
rtw_enter_ips(rtwdev);
|
||||
mutex_unlock(&rtwdev->mutex);
|
||||
}
|
||||
|
||||
@@ -1353,7 +1354,7 @@ void rtw_core_scan_start(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif,
|
||||
|
||||
rtw_leave_lps(rtwdev);
|
||||
|
||||
if (hw_scan && rtwvif->net_type == RTW_NET_NO_LINK) {
|
||||
if (hw_scan && (rtwdev->hw->conf.flags & IEEE80211_CONF_IDLE)) {
|
||||
ret = rtw_leave_ips(rtwdev);
|
||||
if (ret) {
|
||||
rtw_err(rtwdev, "failed to leave idle state\n");
|
||||
@@ -1389,7 +1390,7 @@ void rtw_core_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
|
||||
|
||||
rtw_coex_scan_notify(rtwdev, COEX_SCAN_FINISH);
|
||||
|
||||
if (rtwvif->net_type == RTW_NET_NO_LINK && hw_scan)
|
||||
if (hw_scan && (rtwdev->hw->conf.flags & IEEE80211_CONF_IDLE))
|
||||
ieee80211_queue_work(rtwdev->hw, &rtwdev->ips_work);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user