rtw88: move rtw_enter_ips() to the last when config

When driver is coming up, mac80211 will set changed as ~0 (0xffffffff),
and driver could enter IDLE state (power off) before switching channel or
other config event. So move rtw_enter_ips() to the last, to make sure the
driver completed the config events before going to IDLE state.

So, moves leave/enter IPS config to be first/last one according to flag
IEEE80211_CONF_IDLE. If there're more configureations we want to add in
the future, they must locate between leave/enter IPS.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Reviewed-by: Chris Chiu <chiu@endlessm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 6fc33e11d08cd74be357ffc9b8761e7d5f4a27c4..8742b3f2b5c1606619c5b72c7c9a3dcf49f705d3 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -75,15 +75,12 @@ static int rtw_ops_config(struct ieee80211_hw *hw, u32 changed)
 
        rtw_leave_lps_deep(rtwdev);
 
-       if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-               if (hw->conf.flags & IEEE80211_CONF_IDLE) {
-                       rtw_enter_ips(rtwdev);
-               } else {
-                       ret = rtw_leave_ips(rtwdev);
-                       if (ret) {
-                               rtw_err(rtwdev, "failed to leave idle state\n");
-                               goto out;
-                       }
+       if ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
+           !(hw->conf.flags & IEEE80211_CONF_IDLE)) {
+               ret = rtw_leave_ips(rtwdev);
+               if (ret) {
+                       rtw_err(rtwdev, "failed to leave idle state\n");
+                       goto out;
                }
        }
 
@@ -99,6 +96,10 @@ static int rtw_ops_config(struct ieee80211_hw *hw, u32 changed)
        if (changed & IEEE80211_CONF_CHANGE_CHANNEL)
                rtw_set_channel(rtwdev);
 
+       if ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
+           (hw->conf.flags & IEEE80211_CONF_IDLE))
+               rtw_enter_ips(rtwdev);
+
 out:
        mutex_unlock(&rtwdev->mutex);
        return ret;