|
@@ -1707,7 +1707,8 @@ out:
|
|
|
}
|
|
|
|
|
|
static int wl1271_configure_suspend_ap(struct wl1271 *wl,
|
|
|
- struct wl12xx_vif *wlvif)
|
|
|
+ struct wl12xx_vif *wlvif,
|
|
|
+ struct cfg80211_wowlan *wow)
|
|
|
{
|
|
|
int ret = 0;
|
|
|
|
|
@@ -1715,6 +1716,12 @@ static int wl1271_configure_suspend_ap(struct wl1271 *wl,
|
|
|
goto out;
|
|
|
|
|
|
ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);
|
|
|
+ if (ret < 0)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ ret = wl1271_configure_wowlan(wl, wow);
|
|
|
+ if (ret < 0)
|
|
|
+ goto out;
|
|
|
|
|
|
out:
|
|
|
return ret;
|
|
@@ -1728,7 +1735,7 @@ static int wl1271_configure_suspend(struct wl1271 *wl,
|
|
|
if (wlvif->bss_type == BSS_TYPE_STA_BSS)
|
|
|
return wl1271_configure_suspend_sta(wl, wlvif, wow);
|
|
|
if (wlvif->bss_type == BSS_TYPE_AP_BSS)
|
|
|
- return wl1271_configure_suspend_ap(wl, wlvif);
|
|
|
+ return wl1271_configure_suspend_ap(wl, wlvif, wow);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -1741,12 +1748,13 @@ static void wl1271_configure_resume(struct wl1271 *wl, struct wl12xx_vif *wlvif)
|
|
|
if ((!is_ap) && (!is_sta))
|
|
|
return;
|
|
|
|
|
|
- if (is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
|
|
|
+ if ((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) ||
|
|
|
+ (is_ap && !test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags)))
|
|
|
return;
|
|
|
|
|
|
- if (is_sta) {
|
|
|
- wl1271_configure_wowlan(wl, NULL);
|
|
|
+ wl1271_configure_wowlan(wl, NULL);
|
|
|
|
|
|
+ if (is_sta) {
|
|
|
if ((wl->conf.conn.suspend_wake_up_event ==
|
|
|
wl->conf.conn.wake_up_event) &&
|
|
|
(wl->conf.conn.suspend_listen_interval ==
|