git.openpandora.org
/
pandora-wifi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wl1251: Prepare for idle mode support
[pandora-wifi.git]
/
drivers
/
net
/
wireless
/
wl12xx
/
wl1251_main.c
diff --git
a/drivers/net/wireless/wl12xx/wl1251_main.c
b/drivers/net/wireless/wl12xx/wl1251_main.c
index
1c9bd09
..
8ca7901
100644
(file)
--- a/
drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/
drivers/net/wireless/wl12xx/wl1251_main.c
@@
-540,7
+540,7
@@
static void wl1251_op_stop(struct ieee80211_hw *hw)
wl->rx_last_id = 0;
wl->next_tx_complete = 0;
wl->elp = false;
wl->rx_last_id = 0;
wl->next_tx_complete = 0;
wl->elp = false;
- wl->
psm = 0
;
+ wl->
station_mode = STATION_ACTIVE_MODE
;
wl->tx_queue_stopped = false;
wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
wl->channel = WL1251_DEFAULT_CHANNEL;
wl->tx_queue_stopped = false;
wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
wl->channel = WL1251_DEFAULT_CHANNEL;
@@
-685,7
+685,7
@@
static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
wl->psm_requested = false;
wl->psm_requested = false;
- if (wl->
psm
) {
+ if (wl->
station_mode != STATION_ACTIVE_MODE
) {
ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE);
if (ret < 0)
goto out_sleep;
ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE);
if (ret < 0)
goto out_sleep;
@@
-1398,7
+1398,7
@@
struct ieee80211_hw *wl1251_alloc_hw(void)
wl->rx_config = WL1251_DEFAULT_RX_CONFIG;
wl->rx_filter = WL1251_DEFAULT_RX_FILTER;
wl->elp = false;
wl->rx_config = WL1251_DEFAULT_RX_CONFIG;
wl->rx_filter = WL1251_DEFAULT_RX_FILTER;
wl->elp = false;
- wl->
psm = 0
;
+ wl->
station_mode = STATION_ACTIVE_MODE
;
wl->psm_requested = false;
wl->tx_queue_stopped = false;
wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
wl->psm_requested = false;
wl->tx_queue_stopped = false;
wl->power_level = WL1251_DEFAULT_POWER_LEVEL;