diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index e4867b895c43..6f026fe63d7f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1248,7 +1248,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) | |||
1248 | */ | 1248 | */ |
1249 | if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) { | 1249 | if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) { |
1250 | wl1271_info("psm enabled"); | 1250 | wl1271_info("psm enabled"); |
1251 | ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE); | 1251 | ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE, |
1252 | true); | ||
1252 | } | 1253 | } |
1253 | } else if (!(conf->flags & IEEE80211_CONF_PS) && | 1254 | } else if (!(conf->flags & IEEE80211_CONF_PS) && |
1254 | test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) { | 1255 | test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) { |
@@ -1257,7 +1258,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) | |||
1257 | clear_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags); | 1258 | clear_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags); |
1258 | 1259 | ||
1259 | if (test_bit(WL1271_FLAG_PSM, &wl->flags)) | 1260 | if (test_bit(WL1271_FLAG_PSM, &wl->flags)) |
1260 | ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE); | 1261 | ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE, |
1262 | true); | ||
1261 | } | 1263 | } |
1262 | 1264 | ||
1263 | if (conf->power_level != wl->power_level) { | 1265 | if (conf->power_level != wl->power_level) { |
@@ -1637,7 +1639,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1637 | if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) && | 1639 | if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) && |
1638 | !test_bit(WL1271_FLAG_PSM, &wl->flags)) { | 1640 | !test_bit(WL1271_FLAG_PSM, &wl->flags)) { |
1639 | mode = STATION_POWER_SAVE_MODE; | 1641 | mode = STATION_POWER_SAVE_MODE; |
1640 | ret = wl1271_ps_set_mode(wl, mode); | 1642 | ret = wl1271_ps_set_mode(wl, mode, true); |
1641 | if (ret < 0) | 1643 | if (ret < 0) |
1642 | goto out_sleep; | 1644 | goto out_sleep; |
1643 | } | 1645 | } |