Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ath9k: Check early for multi-vif/STA conditions

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_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Sujith Manoharan and committed by
Kalle Valo
dc4b277d 410b4e27

+7 -15
+7 -15
drivers/net/wireless/ath/ath9k/wow.c
··· 209 209 goto fail_wow; 210 210 } 211 211 212 - ath_cancel_work(sc); 213 - ath_stop_ani(sc); 214 - 215 - /* 216 - * none of the sta vifs are associated 217 - * and we are not currently handling multivif 218 - * cases, for instance we have to seperately 219 - * configure 'keep alive frame' for each 220 - * STA. 221 - */ 212 + if (sc->cur_chan->nvifs > 1) { 213 + ath_dbg(common, WOW, "WoW for multivif is not yet supported\n"); 214 + ret = 1; 215 + goto fail_wow; 216 + } 222 217 223 218 if (!test_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags)) { 224 219 ath_dbg(common, WOW, "None of the STA vifs are associated\n"); ··· 221 226 goto fail_wow; 222 227 } 223 228 224 - if (sc->cur_chan->nvifs > 1) { 225 - ath_dbg(common, WOW, "WoW for multivif is not yet supported\n"); 226 - ret = 1; 227 - goto fail_wow; 228 - } 229 + ath_cancel_work(sc); 230 + ath_stop_ani(sc); 229 231 230 232 ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled); 231 233