* [PATCH 1/2] wl12xx: enter psm only after station role was started
@ 2011-08-23 13:37 Eliad Peller
2011-08-23 13:37 ` [PATCH 2/2] wl12xx: increase psm_entry_retries Eliad Peller
2011-08-25 7:22 ` [PATCH 1/2] wl12xx: enter psm only after station role was started Luciano Coelho
0 siblings, 2 replies; 3+ messages in thread
From: Eliad Peller @ 2011-08-23 13:37 UTC (permalink / raw)
To: Luciano Coelho; +Cc: linux-wireless
The station didn't get into psm after recovery, because
psm was configured before sta role was started.
Move wl1271_ps_set_mode() to be executed only after
the role was started.
Signed-off-by: Eliad Peller <eliad@wizery.com>
---
drivers/net/wireless/wl12xx/main.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 9094fa5..91fbebb 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3349,19 +3349,6 @@ sta_not_found:
ret = wl1271_acx_conn_monit_params(wl, true);
if (ret < 0)
goto out;
-
- /* If we want to go in PSM but we're not there yet */
- if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) &&
- !test_bit(WL1271_FLAG_PSM, &wl->flags)) {
- enum wl1271_cmd_ps_mode mode;
-
- mode = STATION_POWER_SAVE_MODE;
- ret = wl1271_ps_set_mode(wl, mode,
- wl->basic_rate,
- true);
- if (ret < 0)
- goto out;
- }
} else {
/* use defaults when not associated */
bool was_assoc =
@@ -3505,6 +3492,19 @@ sta_not_found:
if (ret < 0)
goto out;
}
+
+ /* If we want to go in PSM but we're not there yet */
+ if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) &&
+ !test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+ enum wl1271_cmd_ps_mode mode;
+
+ mode = STATION_POWER_SAVE_MODE;
+ ret = wl1271_ps_set_mode(wl, mode,
+ wl->basic_rate,
+ true);
+ if (ret < 0)
+ goto out;
+ }
}
/* Handle new association with HT. Do this after join. */
--
1.7.6.401.g6a319
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] wl12xx: increase psm_entry_retries
2011-08-23 13:37 [PATCH 1/2] wl12xx: enter psm only after station role was started Eliad Peller
@ 2011-08-23 13:37 ` Eliad Peller
2011-08-25 7:22 ` [PATCH 1/2] wl12xx: enter psm only after station role was started Luciano Coelho
1 sibling, 0 replies; 3+ messages in thread
From: Eliad Peller @ 2011-08-23 13:37 UTC (permalink / raw)
To: Luciano Coelho; +Cc: linux-wireless
In congested env, sometimes 5 psm entry retries are not enough.
Increase the retries count to 8.
Signed-off-by: Eliad Peller <eliad@wizery.com>
---
drivers/net/wireless/wl12xx/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 91fbebb..554104c 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -236,7 +236,7 @@ static struct conf_drv_settings default_conf = {
.ps_poll_recovery_period = 700,
.bet_enable = CONF_BET_MODE_ENABLE,
.bet_max_consecutive = 50,
- .psm_entry_retries = 5,
+ .psm_entry_retries = 8,
.psm_exit_retries = 16,
.psm_entry_nullfunc_retries = 3,
.psm_entry_hangover_period = 1,
--
1.7.6.401.g6a319
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] wl12xx: enter psm only after station role was started
2011-08-23 13:37 [PATCH 1/2] wl12xx: enter psm only after station role was started Eliad Peller
2011-08-23 13:37 ` [PATCH 2/2] wl12xx: increase psm_entry_retries Eliad Peller
@ 2011-08-25 7:22 ` Luciano Coelho
1 sibling, 0 replies; 3+ messages in thread
From: Luciano Coelho @ 2011-08-25 7:22 UTC (permalink / raw)
To: Eliad Peller; +Cc: linux-wireless
On Tue, 2011-08-23 at 16:37 +0300, Eliad Peller wrote:
> The station didn't get into psm after recovery, because
> psm was configured before sta role was started.
>
> Move wl1271_ps_set_mode() to be executed only after
> the role was started.
>
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> ---
Applied both patches. Toda!
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-25 7:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 13:37 [PATCH 1/2] wl12xx: enter psm only after station role was started Eliad Peller
2011-08-23 13:37 ` [PATCH 2/2] wl12xx: increase psm_entry_retries Eliad Peller
2011-08-25 7:22 ` [PATCH 1/2] wl12xx: enter psm only after station role was started Luciano Coelho
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox