if (ret < 0)
wl1251_warning("join timeout");
+ wl1251_no_ps_event(wl);
+
out:
return ret;
}
}
}
- need_ps = wl->psm_requested && !wl->bss_lost;
have_ps = wl->station_mode == STATION_POWER_SAVE_MODE;
+ need_ps = wl->psm_requested && !wl->bss_lost
+ && wl->rate < wl->ps_rate_threshold;
if (need_ps == have_ps) {
//wl1251_info("ps: already in mode %d", have_ps);
if (need_ps) {
wait = 0;
- diff = jiffies - wl->last_io_jiffies;
- if (diff < msecs_to_jiffies(150)) {
- //wl1251_info("ps: postponed psm, j %ld", diff);
- wait = msecs_to_jiffies(150) - diff + 1;
- }
+ diff = jiffies - wl->last_no_ps_jiffies[1];
+ if (diff < msecs_to_jiffies(1000))
+ wait = msecs_to_jiffies(1000) - diff + 1;
+
+ diff = jiffies - wl->last_no_ps_jiffies[0];
+ if (diff < msecs_to_jiffies(3000))
+ wait += msecs_to_jiffies(1000);
for (i = 0; i < ARRAY_SIZE(wl->tx_frames); i++) {
if (wl->tx_frames[i] != NULL) {
if (ret < 0)
goto out_sleep;
- //wl1251_info("psm %d, j %ld, d %ld", need_ps,
- // jiffies - wl->last_io_jiffies);
+ // wl1251_info("psm %d, r %u", need_ps, wl->rate);
out_sleep:
wl1251_ps_elp_sleep(wl);
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
IEEE80211_HW_SUPPORTS_PS |
+ IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
IEEE80211_HW_BEACON_FILTER |
IEEE80211_HW_SUPPORTS_UAPSD |
IEEE80211_HW_SUPPORTS_CQM_RSSI;
wl->beacon_int = WL1251_DEFAULT_BEACON_INT;
wl->dtim_period = WL1251_DEFAULT_DTIM_PERIOD;
wl->vif = NULL;
+ wl->ps_rate_threshold = 100000;
for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
wl->tx_frames[i] = NULL;