diff options
Diffstat (limited to 'drivers/net/wireless/wl1251/main.c')
-rw-r--r-- | drivers/net/wireless/wl1251/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index 12c9e635a6d6..04a054915dbe 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c | |||
@@ -497,7 +497,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw) | |||
497 | wl->rx_last_id = 0; | 497 | wl->rx_last_id = 0; |
498 | wl->next_tx_complete = 0; | 498 | wl->next_tx_complete = 0; |
499 | wl->elp = false; | 499 | wl->elp = false; |
500 | wl->psm = 0; | 500 | wl->station_mode = STATION_ACTIVE_MODE; |
501 | wl->tx_queue_stopped = false; | 501 | wl->tx_queue_stopped = false; |
502 | wl->power_level = WL1251_DEFAULT_POWER_LEVEL; | 502 | wl->power_level = WL1251_DEFAULT_POWER_LEVEL; |
503 | wl->rssi_thold = 0; | 503 | wl->rssi_thold = 0; |
@@ -632,7 +632,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) | |||
632 | 632 | ||
633 | wl->psm_requested = false; | 633 | wl->psm_requested = false; |
634 | 634 | ||
635 | if (wl->psm) { | 635 | if (wl->station_mode != STATION_ACTIVE_MODE) { |
636 | ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE); | 636 | ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE); |
637 | if (ret < 0) | 637 | if (ret < 0) |
638 | goto out_sleep; | 638 | goto out_sleep; |
@@ -1384,7 +1384,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void) | |||
1384 | wl->rx_config = WL1251_DEFAULT_RX_CONFIG; | 1384 | wl->rx_config = WL1251_DEFAULT_RX_CONFIG; |
1385 | wl->rx_filter = WL1251_DEFAULT_RX_FILTER; | 1385 | wl->rx_filter = WL1251_DEFAULT_RX_FILTER; |
1386 | wl->elp = false; | 1386 | wl->elp = false; |
1387 | wl->psm = 0; | 1387 | wl->station_mode = STATION_ACTIVE_MODE; |
1388 | wl->psm_requested = false; | 1388 | wl->psm_requested = false; |
1389 | wl->tx_queue_stopped = false; | 1389 | wl->tx_queue_stopped = false; |
1390 | wl->power_level = WL1251_DEFAULT_POWER_LEVEL; | 1390 | wl->power_level = WL1251_DEFAULT_POWER_LEVEL; |