Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / net / wireless / wl1251 / ps.c

diff --git a/drivers/net/wireless/wl1251/ps.c b/drivers/net/wireless/wl1251/ps.c
index 97a5b8c..c449857 100644 (file)
--- a/drivers/net/wireless/wl1251/ps.c
+++ b/drivers/net/wireless/wl1251/ps.c
@@ -112,21 +112,18 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_station_mode mode)
        case STATION_POWER_SAVE_MODE:
                wl1251_debug(DEBUG_PSM, "entering psm");
 
-               /* enable beacon filtering */
-               ret = wl1251_acx_beacon_filter_opt(wl, true);
-               if (ret < 0)
-                       return ret;
-
                ret = wl1251_acx_wake_up_conditions(wl,
                                                    WAKE_UP_EVENT_DTIM_BITMAP,
                                                    wl->listen_int);
                if (ret < 0)
                        return ret;
 
+#if 0 /* problems seen on one router */
                ret = wl1251_acx_bet_enable(wl, WL1251_ACX_BET_ENABLE,
                                            WL1251_DEFAULT_BET_CONSECUTIVE);
                if (ret < 0)
                        return ret;
+#endif
 
                ret = wl1251_cmd_ps_mode(wl, CHIP_POWER_SAVE_MODE);
                if (ret < 0)
@@ -136,6 +133,17 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_station_mode mode)
                if (ret < 0)
                        return ret;
                break;
+       case STATION_IDLE:
+               wl1251_debug(DEBUG_PSM, "entering idle");
+
+               ret = wl1251_acx_sleep_auth(wl, WL1251_PSM_ELP);
+               if (ret < 0)
+                       return ret;
+
+               ret = wl1251_cmd_template_set(wl, CMD_DISCONNECT, NULL, 0);
+               if (ret < 0)
+                       return ret;
+               break;
        case STATION_ACTIVE_MODE:
        default:
                wl1251_debug(DEBUG_PSM, "leaving psm");
@@ -144,11 +152,13 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_station_mode mode)
                if (ret < 0)
                        return ret;
 
+#if 0
                /* disable BET */
                ret = wl1251_acx_bet_enable(wl, WL1251_ACX_BET_DISABLE,
                                            WL1251_DEFAULT_BET_CONSECUTIVE);
                if (ret < 0)
                        return ret;
+#endif
 
                /* disable beacon filtering */
                ret = wl1251_acx_beacon_filter_opt(wl, false);
@@ -168,6 +178,8 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_station_mode mode)
                break;
        }
        wl->station_mode = mode;
+       wl->ps_transitioning = true;
+       wl->ps_change_jiffies = jiffies;
 
        return ret;
 }