From: Sujith Manoharan <c_man...@qca.qualcomm.com>

If multiple interfaces are active or there is no
associated station interface, bail out early and
return 1 so that mac80211 can proceed with the normal
suspend routine.

Signed-off-by: Sujith Manoharan <c_man...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath9k/wow.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/wow.c 
b/drivers/net/wireless/ath/ath9k/wow.c
index 272c05c..1799a1d 100644
--- a/drivers/net/wireless/ath/ath9k/wow.c
+++ b/drivers/net/wireless/ath/ath9k/wow.c
@@ -209,29 +209,21 @@ int ath9k_suspend(struct ieee80211_hw *hw,
                goto fail_wow;
        }
 
-       ath_cancel_work(sc);
-       ath_stop_ani(sc);
-
-       /*
-        * none of the sta vifs are associated
-        * and we are not currently handling multivif
-        * cases, for instance we have to seperately
-        * configure 'keep alive frame' for each
-        * STA.
-        */
-
-       if (!test_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags)) {
-               ath_dbg(common, WOW, "None of the STA vifs are associated\n");
+       if (sc->cur_chan->nvifs > 1) {
+               ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
                ret = 1;
                goto fail_wow;
        }
 
-       if (sc->cur_chan->nvifs > 1) {
-               ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
+       if (!test_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags)) {
+               ath_dbg(common, WOW, "None of the STA vifs are associated\n");
                ret = 1;
                goto fail_wow;
        }
 
+       ath_cancel_work(sc);
+       ath_stop_ani(sc);
+
        ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
 
        ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
-- 
2.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to