[PATCH 01/14] rtlwifi: Correct power save capability while init mac80211

[Larry Finger]

Set IEEE80211_HW_SUPPORTS_PS when driver is fwlps
Because mac80211 control SW-LPS only, we add constraints to avoid errors.

Signed-off-by: Vincent Fann <vincent_f...@realtek.com>
Signed-off-by: shaofu <sha...@realtek.com>
Signed-off-by: Ping-Ke Shih <pks...@realtek.com>
Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>
---
 drivers/net/wireless/realtek/rtlwifi/base.c | 2 ++
 drivers/net/wireless/realtek/rtlwifi/core.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c 
b/drivers/net/wireless/realtek/rtlwifi/base.c
index 4ac928b..fa2d26a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -406,6 +406,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                ieee80211_hw_set(hw, SUPPORTS_PS);
                ieee80211_hw_set(hw, PS_NULLFUNC_STACK);
        }
+       if (rtlpriv->psc.fwctrl_lps)
+               ieee80211_hw_set(hw, SUPPORTS_PS);
        hw->wiphy->interface_modes =
            BIT(NL80211_IFTYPE_AP) |
            BIT(NL80211_IFTYPE_STATION) |
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c 
b/drivers/net/wireless/realtek/rtlwifi/core.c
index 2caa4ad..7c2ac24 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -620,7 +620,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 
changed)
        }
 
        /*For LPS */
-       if (changed & IEEE80211_CONF_CHANGE_PS) {
+       if ((changed & IEEE80211_CONF_CHANGE_PS) &&
+           rtlpriv->psc.swctrl_lps && !rtlpriv->psc.fwctrl_lps) {
                cancel_delayed_work(&rtlpriv->works.ps_work);
                cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);
                if (conf->flags & IEEE80211_CONF_PS) {
-- 
2.10.2