wl12xx: enable/disable beacon filtering on ap suspend/resume

Beacon filtering needs to be enabled so AP won't wake up by
by every received beacon.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 6a21c13761ba9a3459cc844e401023a1c3f78e14..00ee01e7d4a40538f8b78085148d225f893ccc54 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1474,13 +1474,10 @@ static struct notifier_block wl1271_dev_notifier = {
 };
 
 #ifdef CONFIG_PM
-static int wl1271_configure_suspend(struct wl1271 *wl)
+static int wl1271_configure_suspend_sta(struct wl1271 *wl)
 {
        int ret;
 
-       if (wl->bss_type != BSS_TYPE_STA_BSS)
-               return 0;
-
        mutex_lock(&wl->mutex);
 
        ret = wl1271_ps_elp_wakeup(wl);
@@ -1525,11 +1522,41 @@ out:
 
 }
 
+static int wl1271_configure_suspend_ap(struct wl1271 *wl)
+{
+       int ret;
+
+       mutex_lock(&wl->mutex);
+
+       ret = wl1271_ps_elp_wakeup(wl);
+       if (ret < 0)
+               goto out_unlock;
+
+       ret = wl1271_acx_set_ap_beacon_filter(wl, true);
+
+       wl1271_ps_elp_sleep(wl);
+out_unlock:
+       mutex_unlock(&wl->mutex);
+       return ret;
+
+}
+
+static int wl1271_configure_suspend(struct wl1271 *wl)
+{
+       if (wl->bss_type == BSS_TYPE_STA_BSS)
+               return wl1271_configure_suspend_sta(wl);
+       if (wl->bss_type == BSS_TYPE_AP_BSS)
+               return wl1271_configure_suspend_ap(wl);
+       return 0;
+}
+
 static void wl1271_configure_resume(struct wl1271 *wl)
 {
        int ret;
+       bool is_sta = wl->bss_type == BSS_TYPE_STA_BSS;
+       bool is_ap = wl->bss_type == BSS_TYPE_AP_BSS;
 
-       if (wl->bss_type != BSS_TYPE_STA_BSS)
+       if (!is_sta && !is_ap)
                return;
 
        mutex_lock(&wl->mutex);
@@ -1537,10 +1564,14 @@ static void wl1271_configure_resume(struct wl1271 *wl)
        if (ret < 0)
                goto out;
 
-       /* exit psm if it wasn't configured */
-       if (!test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags))
-               wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,
-                                  wl->basic_rate, true);
+       if (is_sta) {
+               /* exit psm if it wasn't configured */
+               if (!test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags))
+                       wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,
+                                          wl->basic_rate, true);
+       } else if (is_ap) {
+               wl1271_acx_set_ap_beacon_filter(wl, false);
+       }
 
        wl1271_ps_elp_sleep(wl);
 out: