diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 6b240868ac75..97f7591c3b39 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -2472,8 +2472,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, | |||
2472 | if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { | 2472 | if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { |
2473 | wl1271_debug(DEBUG_PSM, "psm enabled"); | 2473 | wl1271_debug(DEBUG_PSM, "psm enabled"); |
2474 | ret = wl1271_ps_set_mode(wl, wlvif, | 2474 | ret = wl1271_ps_set_mode(wl, wlvif, |
2475 | STATION_POWER_SAVE_MODE, | 2475 | STATION_AUTO_PS_MODE); |
2476 | wlvif->basic_rate, true); | ||
2477 | } | 2476 | } |
2478 | } else if (!(conf->flags & IEEE80211_CONF_PS) && | 2477 | } else if (!(conf->flags & IEEE80211_CONF_PS) && |
2479 | test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) { | 2478 | test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) { |
@@ -2483,8 +2482,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, | |||
2483 | 2482 | ||
2484 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) | 2483 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) |
2485 | ret = wl1271_ps_set_mode(wl, wlvif, | 2484 | ret = wl1271_ps_set_mode(wl, wlvif, |
2486 | STATION_ACTIVE_MODE, | 2485 | STATION_ACTIVE_MODE); |
2487 | wlvif->basic_rate, true); | ||
2488 | } | 2486 | } |
2489 | 2487 | ||
2490 | if (conf->power_level != wlvif->power_level) { | 2488 | if (conf->power_level != wlvif->power_level) { |
@@ -3824,9 +3822,7 @@ sta_not_found: | |||
3824 | !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { | 3822 | !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { |
3825 | 3823 | ||
3826 | ret = wl1271_ps_set_mode(wl, wlvif, | 3824 | ret = wl1271_ps_set_mode(wl, wlvif, |
3827 | STATION_AUTO_PS_MODE, | 3825 | STATION_AUTO_PS_MODE); |
3828 | wlvif->basic_rate, | ||
3829 | true); | ||
3830 | if (ret < 0) | 3826 | if (ret < 0) |
3831 | goto out; | 3827 | goto out; |
3832 | } | 3828 | } |