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>

1 files changed, 4 insertions, 4 deletions

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: