wl1251: implement disconnect command properly

[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 9cc5147..a52ff7a 100644 (file)
--- a/drivers/net/wireless/wl1251/ps.c
+++ b/drivers/net/wireless/wl1251/ps.c
@@ -39,7 +39,7 @@ void wl1251_elp_work(struct work_struct *work)
 
        mutex_lock(&wl->mutex);
 
-       if (wl->elp || !wl->psm)
+       if (wl->elp || wl->station_mode == STATION_ACTIVE_MODE)
                goto out;
 
        wl1251_debug(DEBUG_PSM, "chip to elp");
@@ -57,7 +57,7 @@ void wl1251_ps_elp_sleep(struct wl1251 *wl)
 {
        unsigned long delay;
 
-       if (wl->psm) {
+       if (wl->station_mode != STATION_ACTIVE_MODE) {
                delay = msecs_to_jiffies(ELP_ENTRY_DELAY);
                ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, delay);
        }
@@ -104,7 +104,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
        return 0;
 }
 
-int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode)
+int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_station_mode mode)
 {
        int ret;
 
@@ -112,31 +112,37 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_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)
+                       return ret;
 
-               ret = wl1251_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE);
+               ret = wl1251_acx_sleep_auth(wl, WL1251_PSM_ELP);
                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;
 
-               wl->psm = 1;
+               ret = wl1251_cmd_disconnect(wl);
+               if (ret < 0)
+                       return ret;
                break;
        case STATION_ACTIVE_MODE:
        default:
@@ -146,11 +152,13 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_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);
@@ -163,13 +171,16 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode)
                if (ret < 0)
                        return ret;
 
-               ret = wl1251_cmd_ps_mode(wl, STATION_ACTIVE_MODE);
+               ret = wl1251_cmd_ps_mode(wl, CHIP_ACTIVE_MODE);
                if (ret < 0)
                        return ret;
 
-               wl->psm = 0;
                break;
        }
+       if (mode != wl->station_mode)
+               wl->ps_transitioning = true;
+       wl->station_mode = mode;
+       wl->ps_change_jiffies = jiffies;
 
        return ret;
 }