wl12xx: change WLVIF_FLAG_PSM name and remove WLVIF_FLAG_PSM_REQUESTED

WLVIF_FLAG_PSM turned to WLVIF_FLAG_IN_AUTO_PS which
marks that this vif is in AUTO PS.

WLVIF_FLAG_PSM_REQUESTED is not required as mac80211
calls op_config with CONF_PS after association.

wl12xx_config_vif() handling of CONF_PS was simplified
and cleaned up.

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

4 files changed, 23 insertions, 36 deletions

diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index 4436851a4fa7..4dcb3f758fe2 100644
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -358,7 +358,7 @@ static ssize_t dynamic_ps_timeout_write(struct file *file,
          */
 
         wl12xx_for_each_wlvif_sta(wl, wlvif) {
-                if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
+                if (test_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags))
                         wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);
         }
 
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 97f7591c3b39..4ca7278201ec 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1715,9 +1715,7 @@ static int wl1271_op_start(struct ieee80211_hw *hw)
          * is added. That is where we will initialize the hardware.
          */
 
-        wl1271_error("wl12xx is in an ustable state (fw api update is "
-                     "taking place). skip this commit when bisecting");
-        return -EBUSY;
+        return 0;
 }
 
 static void wl1271_op_stop(struct ieee80211_hw *hw)
@@ -2460,29 +2458,29 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 }
         }
 
-        if (conf->flags & IEEE80211_CONF_PS &&
-            !test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
-                set_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
+        if ((changed & IEEE80211_CONF_CHANGE_PS) && !is_ap) {
+
+                if ((conf->flags & IEEE80211_CONF_PS) &&
+                    test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) &&
+                    !test_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags)) {
+
+                        wl1271_debug(DEBUG_PSM, "auto ps enabled");
 
-                /*
-                 * We enter PSM only if we're already associated.
-                 * If we're not, we'll enter it when joining an SSID,
-                 * through the bss_info_changed() hook.
-                 */
-                if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
-                        wl1271_debug(DEBUG_PSM, "psm enabled");
                         ret = wl1271_ps_set_mode(wl, wlvif,
                                                  STATION_AUTO_PS_MODE);
-                }
-        } else if (!(conf->flags & IEEE80211_CONF_PS) &&
-                   test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
-                wl1271_debug(DEBUG_PSM, "psm disabled");
+                        if (ret < 0)
+                                wl1271_warning("enter auto ps failed %d", ret);
 
-                clear_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
+                } else if (!(conf->flags & IEEE80211_CONF_PS) &&
+                           test_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags)) {
+
+                        wl1271_debug(DEBUG_PSM, "auto ps disabled");
 
-                if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
                         ret = wl1271_ps_set_mode(wl, wlvif,
                                                  STATION_ACTIVE_MODE);
+                        if (ret < 0)
+                                wl1271_warning("exit auto ps failed %d", ret);
+                }
         }
 
         if (conf->power_level != wlvif->power_level) {
@@ -3816,16 +3814,6 @@ sta_not_found:
                         if (ret < 0)
                                 goto out;
                 }
-
-                /* If we want to go in PSM but we're not there yet */
-                if (test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags) &&
-                    !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
-
-                        ret = wl1271_ps_set_mode(wl, wlvif,
-                                                 STATION_AUTO_PS_MODE);
-                        if (ret < 0)
-                                goto out;
-                }
         }
 
         /* Handle new association with HT. Do this after join. */
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c
index d7a91d3c398d..e209e29ffb45 100644
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -56,7 +56,7 @@ void wl1271_elp_work(struct work_struct *work)
                 if (wlvif->bss_type == BSS_TYPE_AP_BSS)
                         goto out;
 
-                if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                if (!test_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags) &&
                     test_bit(WLVIF_FLAG_IN_USE, &wlvif->flags))
                         goto out;
         }
@@ -84,7 +84,7 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
                 if (wlvif->bss_type == BSS_TYPE_AP_BSS)
                         return;
 
-                if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                if (!test_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags) &&
                     test_bit(WLVIF_FLAG_IN_USE, &wlvif->flags))
                         return;
         }
@@ -180,7 +180,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 if (ret < 0)
                         return ret;
 
-                set_bit(WLVIF_FLAG_PSM, &wlvif->flags);
+                set_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags);
 
                 /* enable beacon early termination. Not relevant for 5GHz */
                 if (wlvif->band == IEEE80211_BAND_2GHZ) {
@@ -203,7 +203,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 if (ret < 0)
                         return ret;
 
-                clear_bit(WLVIF_FLAG_PSM, &wlvif->flags);
+                clear_bit(WLVIF_FLAG_IN_AUTO_PS, &wlvif->flags);
                 break;
         case STATION_POWER_SAVE_MODE:
         default:
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index e18e6160fdab..9baed6be6a31 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -254,8 +254,7 @@ enum wl12xx_vif_flags {
         WLVIF_FLAG_STA_ASSOCIATED,
         WLVIF_FLAG_IBSS_JOINED,
         WLVIF_FLAG_AP_STARTED,
-        WLVIF_FLAG_PSM,
-        WLVIF_FLAG_PSM_REQUESTED,
+        WLVIF_FLAG_IN_AUTO_PS,
         WLVIF_FLAG_STA_STATE_SENT,
         WLVIF_FLAG_RX_STREAMING_STARTED,
         WLVIF_FLAG_PSPOLL_FAILURE,