rsi: fix wowlan wakeup issue for hibernate(S4)

At SDIO restore ieee80211_restart_hw() is getting called to restart all
MAC operations. This step is not required.
Returning 1 from mac80211_resume() will serve this purpose.

Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
index aded1ae4fad5f1e37a03cd6743c02fee9e604be8..8d1282f524cf1bedcf9ebccb0d209ba8150cfb22 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
@@ -1938,8 +1938,12 @@ static int rsi_mac80211_resume(struct ieee80211_hw *hw)
 
        rsi_dbg(INFO_ZONE, "%s: mac80211 resume\n", __func__);
 
-       if (common->hibernate_resume)
-               return 0;
+       if (common->hibernate_resume) {
+               /* Device need a complete restart of all MAC operations.
+                * returning 1 will serve this purpose.
+                */
+               return 1;
+       }
 
        mutex_lock(&common->mutex);
        rsi_send_wowlan_request(common, 0, 0);

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 9a3bb0da32023e5653fbcd912c3f9cfd86d1abf7..449803cca73f077e348989a9d3d6a6f5e4ab0689 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -1396,7 +1396,6 @@ static int rsi_restore(struct device *dev)
        common->iface_down = true;
 
        adapter->sc_nvifs = 0;
-       ieee80211_restart_hw(adapter->hw);
 
        common->wow_flags = 0;
        common->iface_down = false;