Because DTIM information is required for powersave
but is only conveyed in beacons, wait for a beacon
before enabling powersave, and change the way the
information is conveyed to the driver accordingly.
mwl8k doesn't currently seem to implement PS but
requires the DTIM period in a different way; after
talking to Lennert we agreed to just have mwl8k do
the parsing itself in the finalize_join work.
Signed-off-by: Johannes Berg <[email protected]>
---
The mwl8k part requires the cfg80211 change.
drivers/net/wireless/iwlwifi/iwl-power.c | 2 +-
drivers/net/wireless/mwl8k.c | 14 +++++++++-----
drivers/net/wireless/wl12xx/wl1251.h | 3 ---
drivers/net/wireless/wl12xx/wl1251_main.c | 25 +++++++------------------
include/net/mac80211.h | 7 ++++++-
net/mac80211/mlme.c | 27 ++++++++++++++++++++++++---
net/mac80211/scan.c | 4 ----
7 files changed, 47 insertions(+), 35 deletions(-)
--- wireless-testing.orig/include/net/mac80211.h 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/include/net/mac80211.h 2010-01-26 09:35:50.000000000 +0100
@@ -186,7 +186,8 @@ enum ieee80211_bss_change {
* @use_short_slot: use short slot time (only relevant for ERP);
* if the hardware cannot handle this it must set the
* IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
- * @dtim_period: num of beacons before the next DTIM, for PSM
+ * @dtim_period: num of beacons before the next DTIM, for beaconing,
+ * not valid in station mode (cf. hw conf ps_dtim_period)
* @timestamp: beacon timestamp
* @beacon_int: beacon interval
* @assoc_capability: capabilities taken from assoc resp
@@ -652,6 +653,9 @@ enum ieee80211_smps_mode {
* value will be only achievable between DTIM frames, the hardware
* needs to check for the multicast traffic bit in DTIM beacons.
* This variable is valid only when the CONF_PS flag is set.
+ * @ps_dtim_period: The DTIM period of the AP we're connected to, for use
+ * in power saving. Power saving will not be enabled until a beacon
+ * has been received and the DTIM period is known.
* @dynamic_ps_timeout: The dynamic powersave timeout (in ms), see the
* powersave documentation below. This variable is valid only when
* the CONF_PS flag is set.
@@ -678,6 +682,7 @@ struct ieee80211_conf {
int max_sleep_period;
u16 listen_interval;
+ u8 ps_dtim_period;
u8 long_frame_max_tx_count, short_frame_max_tx_count;
--- wireless-testing.orig/net/mac80211/mlme.c 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/net/mac80211/mlme.c 2010-01-26 09:35:50.000000000 +0100
@@ -480,6 +480,7 @@ void ieee80211_recalc_ps(struct ieee8021
if (count == 1 && found->u.mgd.powersave &&
found->u.mgd.associated &&
+ found->u.mgd.associated->beacon_ies &&
!(found->u.mgd.flags & (IEEE80211_STA_BEACON_POLL |
IEEE80211_STA_CONNECTION_POLL))) {
s32 beaconint_us;
@@ -493,14 +494,22 @@ void ieee80211_recalc_ps(struct ieee8021
if (beaconint_us > latency) {
local->ps_sdata = NULL;
} else {
- u8 dtimper = found->vif.bss_conf.dtim_period;
+ struct ieee80211_bss *bss;
int maxslp = 1;
+ u8 dtimper;
- if (dtimper > 1)
+ bss = (void *)found->u.mgd.associated->priv;
+ dtimper = bss->dtim_period;
+
+ /* If the TIM IE is invalid, pretend the value is 1 */
+ if (!dtimper)
+ dtimper = 1;
+ else if (dtimper > 1)
maxslp = min_t(int, dtimper,
latency / beaconint_us);
local->hw.conf.max_sleep_period = maxslp;
+ local->hw.conf.ps_dtim_period = dtimper;
local->ps_sdata = found;
}
} else {
@@ -698,7 +707,6 @@ static void ieee80211_set_associated(str
/* set timing information */
sdata->vif.bss_conf.beacon_int = cbss->beacon_interval;
sdata->vif.bss_conf.timestamp = cbss->tsf;
- sdata->vif.bss_conf.dtim_period = bss->dtim_period;
bss_info_changed |= BSS_CHANGED_BEACON_INT;
bss_info_changed |= ieee80211_handle_bss_capability(sdata,
@@ -1164,6 +1172,13 @@ static void ieee80211_rx_bss_info(struct
int freq;
struct ieee80211_bss *bss;
struct ieee80211_channel *channel;
+ bool need_ps = false;
+
+ if (sdata->u.mgd.associated) {
+ bss = (void *)sdata->u.mgd.associated->priv;
+ /* not previously set so we may need to recalc */
+ need_ps = !bss->dtim_period;
+ }
if (elems->ds_params && elems->ds_params_len == 1)
freq = ieee80211_channel_to_frequency(elems->ds_params[0]);
@@ -1183,6 +1198,12 @@ static void ieee80211_rx_bss_info(struct
if (!sdata->u.mgd.associated)
return;
+ if (need_ps) {
+ mutex_lock(&local->iflist_mtx);
+ ieee80211_recalc_ps(local, -1);
+ mutex_unlock(&local->iflist_mtx);
+ }
+
if (elems->ch_switch_elem && (elems->ch_switch_elem_len == 3) &&
(memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid,
ETH_ALEN) == 0)) {
--- wireless-testing.orig/net/mac80211/scan.c 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/net/mac80211/scan.c 2010-01-26 09:35:50.000000000 +0100
@@ -111,10 +111,6 @@ ieee80211_bss_info_update(struct ieee802
bss->dtim_period = tim_ie->dtim_period;
}
- /* set default value for buggy AP/no TIM element */
- if (bss->dtim_period == 0)
- bss->dtim_period = 1;
-
bss->supp_rates_len = 0;
if (elems->supp_rates) {
clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
--- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-power.c 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-power.c 2010-01-26 09:35:50.000000000 +0100
@@ -319,7 +319,7 @@ int iwl_power_update_mode(struct iwl_pri
priv->chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE;
if (priv->vif)
- dtimper = priv->vif->bss_conf.dtim_period;
+ dtimper = priv->hw->conf.ps_dtim_period;
else
dtimper = 1;
--- wireless-testing.orig/drivers/net/wireless/wl12xx/wl1251.h 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/drivers/net/wireless/wl12xx/wl1251.h 2010-01-26 09:35:50.000000000 +0100
@@ -341,9 +341,6 @@ struct wl1251 {
/* Are we currently scanning */
bool scanning;
- /* Our association ID */
- u16 aid;
-
/* Default key (for WEP) */
u32 default_key;
--- wireless-testing.orig/drivers/net/wireless/wl12xx/wl1251_main.c 2010-01-26 09:35:35.000000000 +0100
+++ wireless-testing/drivers/net/wireless/wl12xx/wl1251_main.c 2010-01-26 09:35:50.000000000 +0100
@@ -617,10 +617,13 @@ static int wl1251_op_config(struct ieee8
wl->psm_requested = true;
+ wl->dtim_period = conf->ps_dtim_period;
+
+ ret = wl1251_acx_wr_tbtt_and_dtim(wl, wl->beacon_int,
+ wl->dtim_period);
+
/*
- * We enter PSM only if we're already associated.
- * If we're not, we'll enter it when joining an SSID,
- * through the bss_info_changed() hook.
+ * mac80211 enables PSM only if we're already associated.
*/
ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
if (ret < 0)
@@ -943,7 +946,6 @@ static void wl1251_op_bss_info_changed(s
struct ieee80211_bss_conf *bss_conf,
u32 changed)
{
- enum wl1251_cmd_ps_mode mode;
struct wl1251 *wl = hw->priv;
struct sk_buff *beacon, *skb;
int ret;
@@ -984,11 +986,6 @@ static void wl1251_op_bss_info_changed(s
if (changed & BSS_CHANGED_ASSOC) {
if (bss_conf->assoc) {
wl->beacon_int = bss_conf->beacon_int;
- wl->dtim_period = bss_conf->dtim_period;
-
- ret = wl1251_acx_wr_tbtt_and_dtim(wl, wl->beacon_int,
- wl->dtim_period);
- wl->aid = bss_conf->aid;
skb = ieee80211_pspoll_get(wl->hw, wl->vif);
if (!skb)
@@ -1001,17 +998,9 @@ static void wl1251_op_bss_info_changed(s
if (ret < 0)
goto out_sleep;
- ret = wl1251_acx_aid(wl, wl->aid);
+ ret = wl1251_acx_aid(wl, bss_conf->aid);
if (ret < 0)
goto out_sleep;
-
- /* If we want to go in PSM but we're not there yet */
- if (wl->psm_requested && !wl->psm) {
- mode = STATION_POWER_SAVE_MODE;
- ret = wl1251_ps_set_mode(wl, mode);
- if (ret < 0)
- goto out_sleep;
- }
} else {
/* use defaults when not associated */
wl->beacon_int = WL1251_DEFAULT_BEACON_INT;
--- wireless-testing.orig/drivers/net/wireless/mwl8k.c 2010-01-26 09:35:41.000000000 +0100
+++ wireless-testing/drivers/net/wireless/mwl8k.c 2010-01-26 09:35:56.000000000 +0100
@@ -3881,12 +3881,16 @@ static void mwl8k_finalize_join_worker(s
struct mwl8k_priv *priv =
container_of(work, struct mwl8k_priv, finalize_join_worker);
struct sk_buff *skb = priv->beacon_skb;
- struct mwl8k_vif *mwl8k_vif;
+ struct ieee80211_mgmt *mgmt = (void *)skb->data;
+ int len = skb->len - offsetof(struct ieee80211_mgmt, u.beacon.variable);
+ const u8 *tim = cfg80211_find_ie(WLAN_EID_TIM,
+ mgmt->u.beacon.variable, len);
+ int dtim_period = 1;
- mwl8k_vif = mwl8k_first_vif(priv);
- if (mwl8k_vif != NULL)
- mwl8k_cmd_finalize_join(priv->hw, skb->data, skb->len,
- mwl8k_vif->vif->bss_conf.dtim_period);
+ if (tim && tim[1] >= 2)
+ dtim_period = tim[3];
+
+ mwl8k_cmd_finalize_join(priv->hw, skb->data, skb->len, dtim_period);
dev_kfree_skb(skb);
priv->beacon_skb = NULL;
T24gVHVlLCBKYW4gMjYsIDIwMTAgYXQgNToxOSBBTSwgSm9oYW5uZXMgQmVyZwo8am9oYW5uZXNA
c2lwc29sdXRpb25zLm5ldD4gd3JvdGU6Cj4gQmVjYXVzZSBEVElNIGluZm9ybWF0aW9uIGlzIHJl
cXVpcmVkIGZvciBwb3dlcnNhdmUKPiBidXQgaXMgb25seSBjb252ZXllZCBpbiBiZWFjb25zLCB3
YWl0IGZvciBhIGJlYWNvbgo+IGJlZm9yZSBlbmFibGluZyBwb3dlcnNhdmUsIGFuZCBjaGFuZ2Ug
dGhlIHdheSB0aGUKPiBpbmZvcm1hdGlvbiBpcyBjb252ZXllZCB0byB0aGUgZHJpdmVyIGFjY29y
ZGluZ2x5Lgo+Cj4gbXdsOGsgZG9lc24ndCBjdXJyZW50bHkgc2VlbSB0byBpbXBsZW1lbnQgUFMg
YnV0Cj4gcmVxdWlyZXMgdGhlIERUSU0gcGVyaW9kIGluIGEgZGlmZmVyZW50IHdheTsgYWZ0ZXIK
PiB0YWxraW5nIHRvIExlbm5lcnQgd2UgYWdyZWVkIHRvIGp1c3QgaGF2ZSBtd2w4ayBkbwo+IHRo
ZSBwYXJzaW5nIGl0c2VsZiBpbiB0aGUgZmluYWxpemVfam9pbiB3b3JrLgoKTm90IHN1cmUgaWYg
dGhpcyBpcyBtZXJnZWQgeWV0LiBJZiBub3QgaXQgbWlnaHQgYmUgZ29vZCB0byBhZGQgdG8gdGhl
CmNvbW1pdCBsb2cgYSBicmllZiBhYm91dCB0aGUgaW1wYWN0IG9mIHRoZSBmaXggZm9yIGRpc3Ry
aWJ1dGlvbgpwdXJwb3NlcyBsb29raW5nIHRvIGNoZXJyeSBwaWNrIHNvbWUgZml4ZXMgdGhhdCBt
YXkgY3VyZSBzb21lIGlzc3Vlcy4KClRoZSBpbXBhY3Qgb2YgdGhpcyBmaXggaXMgdGhhdCB0aGUg
RFRJTSBzZXR0aW5ncyBvZiA+IDEgd291bGQgbm93IGJlCnJlc3BlY3RlZCBpbiB0aGUgb2RkIHNp
dHVhdGlvbiBhIGJlYWNvbiB3b3VsZCBub3QgYmUgcmVjZWl2ZWQgcHJpb3IgdG8KYXNzb2NpYXRp
b24uIEVuc3VyaW5nIHdlIHVzZSBhIGhpZ2hlciBEVElNIHdvdWxkIG1lYW4gc2F2aW5nIG1vcmUK
cG93ZXIgYXMgaXQgd291bGQgbWVhbiB3ZSBjYW4gc2xlZXAgbG9uZ2VyLgoKVGhpcyBpcyBub3Qg
cHJvcGFnYXRlZCB0byBzdGFibGUgYnV0IGlmIGl0IHR1cm5zIG91dCB0aGlzIGNhbiBlbmhhbmNl
CnBvd2VyIHNhdmUgc2luY2UgRFRJTSBtaWdodCB1c3VhbGx5IGJlID4gMSBhbmQgdGhlIHJhY2Ug
bWF5IGJlIG1vcmUKY29tbW9uIHRoYW4gd2UgZXhwZWN0ZWQgd2UgbWF5IG5lZWQgYSByZXNwZWN0
aXZlIHN0YWJsZSBzb2x1dGlvbi4KCiAgTHVpcwoKPiBTaWduZWQtb2ZmLWJ5OiBKb2hhbm5lcyBC
ZXJnIDxqb2hhbm5lc0BzaXBzb2x1dGlvbnMubmV0Pgo+IC0tLQo+IFRoZSBtd2w4ayBwYXJ0IHJl
cXVpcmVzIHRoZSBjZmc4MDIxMSBjaGFuZ2UuCj4KPiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3
bHdpZmkvaXdsLXBvd2VyLmMgwqB8IMKgIMKgMiArLQo+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3Mv
bXdsOGsuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoHwgwqAgMTQgKysrKysrKysrLS0tLS0KPiDCoGRy
aXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4eC93bDEyNTEuaCDCoCDCoCDCoHwgwqAgwqAzIC0tLQo+
IMKgZHJpdmVycy9uZXQvd2lyZWxlc3Mvd2wxMnh4L3dsMTI1MV9tYWluLmMgfCDCoCAyNSArKysr
KysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gwqBpbmNsdWRlL25ldC9tYWM4MDIxMS5oIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDcgKysrKysrLQo+IMKgbmV0L21hYzgwMjExL21s
bWUuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIDI3ICsrKysrKysrKysr
KysrKysrKysrKysrKy0tLQo+IMKgbmV0L21hYzgwMjExL3NjYW4uYyDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgNCAtLS0tCj4gwqA3IGZpbGVzIGNoYW5nZWQsIDQ3IGlu
c2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQo+Cj4gLS0tIHdpcmVsZXNzLXRlc3Rpbmcub3Jp
Zy9pbmNsdWRlL25ldC9tYWM4MDIxMS5oIMKgIMKgIMKgIMKgMjAxMC0wMS0yNiAwOTozNTozNS4w
MDAwMDAwMDAgKzAxMDAKPiArKysgd2lyZWxlc3MtdGVzdGluZy9pbmNsdWRlL25ldC9tYWM4MDIx
MS5oIMKgIMKgIDIwMTAtMDEtMjYgMDk6MzU6NTAuMDAwMDAwMDAwICswMTAwCj4gQEAgLTE4Niw3
ICsxODYsOCBAQCBlbnVtIGllZWU4MDIxMV9ic3NfY2hhbmdlIHsKPiDCoCogQHVzZV9zaG9ydF9z
bG90OiB1c2Ugc2hvcnQgc2xvdCB0aW1lIChvbmx5IHJlbGV2YW50IGZvciBFUlApOwo+IMKgKiDC
oCDCoCBpZiB0aGUgaGFyZHdhcmUgY2Fubm90IGhhbmRsZSB0aGlzIGl0IG11c3Qgc2V0IHRoZQo+
IMKgKiDCoCDCoCBJRUVFODAyMTFfSFdfMkdIWl9TSE9SVF9TTE9UX0lOQ0FQQUJMRSBoYXJkd2Fy
ZSBmbGFnCj4gLSAqIEBkdGltX3BlcmlvZDogbnVtIG9mIGJlYWNvbnMgYmVmb3JlIHRoZSBuZXh0
IERUSU0sIGZvciBQU00KPiArICogQGR0aW1fcGVyaW9kOiBudW0gb2YgYmVhY29ucyBiZWZvcmUg
dGhlIG5leHQgRFRJTSwgZm9yIGJlYWNvbmluZywKPiArICogwqAgwqAgbm90IHZhbGlkIGluIHN0
YXRpb24gbW9kZSAoY2YuIGh3IGNvbmYgcHNfZHRpbV9wZXJpb2QpCj4gwqAqIEB0aW1lc3RhbXA6
IGJlYWNvbiB0aW1lc3RhbXAKPiDCoCogQGJlYWNvbl9pbnQ6IGJlYWNvbiBpbnRlcnZhbAo+IMKg
KiBAYXNzb2NfY2FwYWJpbGl0eTogY2FwYWJpbGl0aWVzIHRha2VuIGZyb20gYXNzb2MgcmVzcAo+
IEBAIC02NTIsNiArNjUzLDkgQEAgZW51bSBpZWVlODAyMTFfc21wc19tb2RlIHsKPiDCoCogwqAg
wqAgdmFsdWUgd2lsbCBiZSBvbmx5IGFjaGlldmFibGUgYmV0d2VlbiBEVElNIGZyYW1lcywgdGhl
IGhhcmR3YXJlCj4gwqAqIMKgIMKgIG5lZWRzIHRvIGNoZWNrIGZvciB0aGUgbXVsdGljYXN0IHRy
YWZmaWMgYml0IGluIERUSU0gYmVhY29ucy4KPiDCoCogwqAgwqAgVGhpcyB2YXJpYWJsZSBpcyB2
YWxpZCBvbmx5IHdoZW4gdGhlIENPTkZfUFMgZmxhZyBpcyBzZXQuCj4gKyAqIEBwc19kdGltX3Bl
cmlvZDogVGhlIERUSU0gcGVyaW9kIG9mIHRoZSBBUCB3ZSdyZSBjb25uZWN0ZWQgdG8sIGZvciB1
c2UKPiArICogwqAgwqAgaW4gcG93ZXIgc2F2aW5nLiBQb3dlciBzYXZpbmcgd2lsbCBub3QgYmUg
ZW5hYmxlZCB1bnRpbCBhIGJlYWNvbgo+ICsgKiDCoCDCoCBoYXMgYmVlbiByZWNlaXZlZCBhbmQg
dGhlIERUSU0gcGVyaW9kIGlzIGtub3duLgo+IMKgKiBAZHluYW1pY19wc190aW1lb3V0OiBUaGUg
ZHluYW1pYyBwb3dlcnNhdmUgdGltZW91dCAoaW4gbXMpLCBzZWUgdGhlCj4gwqAqIMKgIMKgIHBv
d2Vyc2F2ZSBkb2N1bWVudGF0aW9uIGJlbG93LiBUaGlzIHZhcmlhYmxlIGlzIHZhbGlkIG9ubHkg
d2hlbgo+IMKgKiDCoCDCoCB0aGUgQ09ORl9QUyBmbGFnIGlzIHNldC4KPiBAQCAtNjc4LDYgKzY4
Miw3IEBAIHN0cnVjdCBpZWVlODAyMTFfY29uZiB7Cj4gwqAgwqAgwqAgwqBpbnQgbWF4X3NsZWVw
X3BlcmlvZDsKPgo+IMKgIMKgIMKgIMKgdTE2IGxpc3Rlbl9pbnRlcnZhbDsKPiArIMKgIMKgIMKg
IHU4IHBzX2R0aW1fcGVyaW9kOwo+Cj4gwqAgwqAgwqAgwqB1OCBsb25nX2ZyYW1lX21heF90eF9j
b3VudCwgc2hvcnRfZnJhbWVfbWF4X3R4X2NvdW50Owo+Cj4gLS0tIHdpcmVsZXNzLXRlc3Rpbmcu
b3JpZy9uZXQvbWFjODAyMTEvbWxtZS5jIMKgIDIwMTAtMDEtMjYgMDk6MzU6MzUuMDAwMDAwMDAw
ICswMTAwCj4gKysrIHdpcmVsZXNzLXRlc3RpbmcvbmV0L21hYzgwMjExL21sbWUuYyDCoCDCoCDC
oCDCoDIwMTAtMDEtMjYgMDk6MzU6NTAuMDAwMDAwMDAwICswMTAwCj4gQEAgLTQ4MCw2ICs0ODAs
NyBAQCB2b2lkIGllZWU4MDIxMV9yZWNhbGNfcHMoc3RydWN0IGllZWU4MDIxCj4KPiDCoCDCoCDC
oCDCoGlmIChjb3VudCA9PSAxICYmIGZvdW5kLT51Lm1nZC5wb3dlcnNhdmUgJiYKPiDCoCDCoCDC
oCDCoCDCoCDCoGZvdW5kLT51Lm1nZC5hc3NvY2lhdGVkICYmCj4gKyDCoCDCoCDCoCDCoCDCoCBm
b3VuZC0+dS5tZ2QuYXNzb2NpYXRlZC0+YmVhY29uX2llcyAmJgo+IMKgIMKgIMKgIMKgIMKgIMKg
IShmb3VuZC0+dS5tZ2QuZmxhZ3MgJiAoSUVFRTgwMjExX1NUQV9CRUFDT05fUE9MTCB8Cj4gwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBJRUVFODAy
MTFfU1RBX0NPTk5FQ1RJT05fUE9MTCkpKSB7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBzMzIg
YmVhY29uaW50X3VzOwo+IEBAIC00OTMsMTQgKzQ5NCwyMiBAQCB2b2lkIGllZWU4MDIxMV9yZWNh
bGNfcHMoc3RydWN0IGllZWU4MDIxCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBpZiAoYmVhY29u
aW50X3VzID4gbGF0ZW5jeSkgewo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
bG9jYWwtPnBzX3NkYXRhID0gTlVMTDsKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoH0gZWxzZSB7
Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB1OCBkdGltcGVyID0gZm91bmQt
PnZpZi5ic3NfY29uZi5kdGltX3BlcmlvZDsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIHN0cnVjdCBpZWVlODAyMTFfYnNzICpic3M7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqBpbnQgbWF4c2xwID0gMTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIHU4IGR0aW1wZXI7Cj4KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIGlmIChkdGltcGVyID4gMSkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IGJzcyA9ICh2b2lkICopZm91bmQtPnUubWdkLmFzc29jaWF0ZWQtPnByaXY7Cj4gKyDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBkdGltcGVyID0gYnNzLT5kdGltX3BlcmlvZDsKPiAr
Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAvKiBJZiB0aGUgVElNIElFIGlz
IGludmFsaWQsIHByZXRlbmQgdGhlIHZhbHVlIGlzIDEgKi8KPiArIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIGlmICghZHRpbXBlcikKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIGR0aW1wZXIgPSAxOwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgZWxzZSBpZiAoZHRpbXBlciA+IDEpCj4gwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBtYXhzbHAgPSBtaW5fdChpbnQsIGR0aW1wZXIs
Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBsYXRlbmN5IC8gYmVhY29uaW50X3VzKTsKPgo+IMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgbG9jYWwtPmh3LmNvbmYubWF4X3NsZWVwX3Bl
cmlvZCA9IG1heHNscDsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGxvY2Fs
LT5ody5jb25mLnBzX2R0aW1fcGVyaW9kID0gZHRpbXBlcjsKPiDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoGxvY2FsLT5wc19zZGF0YSA9IGZvdW5kOwo+IMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgfQo+IMKgIMKgIMKgIMKgfSBlbHNlIHsKPiBAQCAtNjk4LDcgKzcwNyw2IEBAIHN0
YXRpYyB2b2lkIGllZWU4MDIxMV9zZXRfYXNzb2NpYXRlZChzdHIKPiDCoCDCoCDCoCDCoC8qIHNl
dCB0aW1pbmcgaW5mb3JtYXRpb24gKi8KPiDCoCDCoCDCoCDCoHNkYXRhLT52aWYuYnNzX2NvbmYu
YmVhY29uX2ludCA9IGNic3MtPmJlYWNvbl9pbnRlcnZhbDsKPiDCoCDCoCDCoCDCoHNkYXRhLT52
aWYuYnNzX2NvbmYudGltZXN0YW1wID0gY2Jzcy0+dHNmOwo+IC0gwqAgwqAgwqAgc2RhdGEtPnZp
Zi5ic3NfY29uZi5kdGltX3BlcmlvZCA9IGJzcy0+ZHRpbV9wZXJpb2Q7Cj4KPiDCoCDCoCDCoCDC
oGJzc19pbmZvX2NoYW5nZWQgfD0gQlNTX0NIQU5HRURfQkVBQ09OX0lOVDsKPiDCoCDCoCDCoCDC
oGJzc19pbmZvX2NoYW5nZWQgfD0gaWVlZTgwMjExX2hhbmRsZV9ic3NfY2FwYWJpbGl0eShzZGF0
YSwKPiBAQCAtMTE2NCw2ICsxMTcyLDEzIEBAIHN0YXRpYyB2b2lkIGllZWU4MDIxMV9yeF9ic3Nf
aW5mbyhzdHJ1Y3QKPiDCoCDCoCDCoCDCoGludCBmcmVxOwo+IMKgIMKgIMKgIMKgc3RydWN0IGll
ZWU4MDIxMV9ic3MgKmJzczsKPiDCoCDCoCDCoCDCoHN0cnVjdCBpZWVlODAyMTFfY2hhbm5lbCAq
Y2hhbm5lbDsKPiArIMKgIMKgIMKgIGJvb2wgbmVlZF9wcyA9IGZhbHNlOwo+ICsKPiArIMKgIMKg
IMKgIGlmIChzZGF0YS0+dS5tZ2QuYXNzb2NpYXRlZCkgewo+ICsgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgYnNzID0gKHZvaWQgKilzZGF0YS0+dS5tZ2QuYXNzb2NpYXRlZC0+cHJpdjsKPiArIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIC8qIG5vdCBwcmV2aW91c2x5IHNldCBzbyB3ZSBtYXkgbmVlZCB0byBy
ZWNhbGMgKi8KPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG5lZWRfcHMgPSAhYnNzLT5kdGltX3Bl
cmlvZDsKPiArIMKgIMKgIMKgIH0KPgo+IMKgIMKgIMKgIMKgaWYgKGVsZW1zLT5kc19wYXJhbXMg
JiYgZWxlbXMtPmRzX3BhcmFtc19sZW4gPT0gMSkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGZy
ZXEgPSBpZWVlODAyMTFfY2hhbm5lbF90b19mcmVxdWVuY3koZWxlbXMtPmRzX3BhcmFtc1swXSk7
Cj4gQEAgLTExODMsNiArMTE5OCwxMiBAQCBzdGF0aWMgdm9pZCBpZWVlODAyMTFfcnhfYnNzX2lu
Zm8oc3RydWN0Cj4gwqAgwqAgwqAgwqBpZiAoIXNkYXRhLT51Lm1nZC5hc3NvY2lhdGVkKQo+IMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgcmV0dXJuOwo+Cj4gKyDCoCDCoCDCoCBpZiAobmVlZF9wcykg
ewo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbXV0ZXhfbG9jaygmbG9jYWwtPmlmbGlzdF9tdHgp
Owo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWVlZTgwMjExX3JlY2FsY19wcyhsb2NhbCwgLTEp
Owo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbXV0ZXhfdW5sb2NrKCZsb2NhbC0+aWZsaXN0X210
eCk7Cj4gKyDCoCDCoCDCoCB9Cj4gKwo+IMKgIMKgIMKgIMKgaWYgKGVsZW1zLT5jaF9zd2l0Y2hf
ZWxlbSAmJiAoZWxlbXMtPmNoX3N3aXRjaF9lbGVtX2xlbiA9PSAzKSAmJgo+IMKgIMKgIMKgIMKg
IMKgIMKgKG1lbWNtcChtZ210LT5ic3NpZCwgc2RhdGEtPnUubWdkLmFzc29jaWF0ZWQtPmJzc2lk
LAo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgRVRIX0FMRU4pID09IDApKSB7Cj4gLS0tIHdp
cmVsZXNzLXRlc3Rpbmcub3JpZy9uZXQvbWFjODAyMTEvc2Nhbi5jIMKgIDIwMTAtMDEtMjYgMDk6
MzU6MzUuMDAwMDAwMDAwICswMTAwCj4gKysrIHdpcmVsZXNzLXRlc3RpbmcvbmV0L21hYzgwMjEx
L3NjYW4uYyDCoCDCoCDCoCDCoDIwMTAtMDEtMjYgMDk6MzU6NTAuMDAwMDAwMDAwICswMTAwCj4g
QEAgLTExMSwxMCArMTExLDYgQEAgaWVlZTgwMjExX2Jzc19pbmZvX3VwZGF0ZShzdHJ1Y3QgaWVl
ZTgwMgo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgYnNzLT5kdGltX3BlcmlvZCA9IHRpbV9pZS0+
ZHRpbV9wZXJpb2Q7Cj4gwqAgwqAgwqAgwqB9Cj4KPiAtIMKgIMKgIMKgIC8qIHNldCBkZWZhdWx0
IHZhbHVlIGZvciBidWdneSBBUC9ubyBUSU0gZWxlbWVudCAqLwo+IC0gwqAgwqAgwqAgaWYgKGJz
cy0+ZHRpbV9wZXJpb2QgPT0gMCkKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGJzcy0+ZHRpbV9w
ZXJpb2QgPSAxOwo+IC0KPiDCoCDCoCDCoCDCoGJzcy0+c3VwcF9yYXRlc19sZW4gPSAwOwo+IMKg
IMKgIMKgIMKgaWYgKGVsZW1zLT5zdXBwX3JhdGVzKSB7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqBjbGVuID0gSUVFRTgwMjExX01BWF9TVVBQX1JBVEVTIC0gYnNzLT5zdXBwX3JhdGVzX2xlbjsK
PiAtLS0gd2lyZWxlc3MtdGVzdGluZy5vcmlnL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkv
aXdsLXBvd2VyLmMgwqAgwqAgwqAyMDEwLTAxLTI2IDA5OjM1OjM1LjAwMDAwMDAwMCArMDEwMAo+
ICsrKyB3aXJlbGVzcy10ZXN0aW5nL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLXBv
d2VyLmMgwqAgMjAxMC0wMS0yNiAwOTozNTo1MC4wMDAwMDAwMDAgKzAxMDAKPiBAQCAtMzE5LDcg
KzMxOSw3IEBAIGludCBpd2xfcG93ZXJfdXBkYXRlX21vZGUoc3RydWN0IGl3bF9wcmkKPiDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHByaXYtPmNoYWluX25vaXNlX2RhdGEuc3Rh
dGUgPT0gSVdMX0NIQUlOX05PSVNFX0FMSVZFOwo+Cj4gwqAgwqAgwqAgwqBpZiAocHJpdi0+dmlm
KQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgZHRpbXBlciA9IHByaXYtPnZpZi0+YnNzX2NvbmYu
ZHRpbV9wZXJpb2Q7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBkdGltcGVyID0gcHJpdi0+aHct
PmNvbmYucHNfZHRpbV9wZXJpb2Q7Cj4gwqAgwqAgwqAgwqBlbHNlCj4gwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqBkdGltcGVyID0gMTsKPgo+IC0tLSB3aXJlbGVzcy10ZXN0aW5nLm9yaWcvZHJpdmVy
cy9uZXQvd2lyZWxlc3Mvd2wxMnh4L3dsMTI1MS5oIMKgMjAxMC0wMS0yNiAwOTozNTozNS4wMDAw
MDAwMDAgKzAxMDAKPiArKysgd2lyZWxlc3MtdGVzdGluZy9kcml2ZXJzL25ldC93aXJlbGVzcy93
bDEyeHgvd2wxMjUxLmggwqAgwqAgwqAgMjAxMC0wMS0yNiAwOTozNTo1MC4wMDAwMDAwMDAgKzAx
MDAKPiBAQCAtMzQxLDkgKzM0MSw2IEBAIHN0cnVjdCB3bDEyNTEgewo+IMKgIMKgIMKgIMKgLyog
QXJlIHdlIGN1cnJlbnRseSBzY2FubmluZyAqLwo+IMKgIMKgIMKgIMKgYm9vbCBzY2FubmluZzsK
Pgo+IC0gwqAgwqAgwqAgLyogT3VyIGFzc29jaWF0aW9uIElEICovCj4gLSDCoCDCoCDCoCB1MTYg
YWlkOwo+IC0KPiDCoCDCoCDCoCDCoC8qIERlZmF1bHQga2V5IChmb3IgV0VQKSAqLwo+IMKgIMKg
IMKgIMKgdTMyIGRlZmF1bHRfa2V5Owo+Cj4gLS0tIHdpcmVsZXNzLXRlc3Rpbmcub3JpZy9kcml2
ZXJzL25ldC93aXJlbGVzcy93bDEyeHgvd2wxMjUxX21haW4uYyDCoCDCoCAyMDEwLTAxLTI2IDA5
OjM1OjM1LjAwMDAwMDAwMCArMDEwMAo+ICsrKyB3aXJlbGVzcy10ZXN0aW5nL2RyaXZlcnMvbmV0
L3dpcmVsZXNzL3dsMTJ4eC93bDEyNTFfbWFpbi5jIMKgMjAxMC0wMS0yNiAwOTozNTo1MC4wMDAw
MDAwMDAgKzAxMDAKPiBAQCAtNjE3LDEwICs2MTcsMTMgQEAgc3RhdGljIGludCB3bDEyNTFfb3Bf
Y29uZmlnKHN0cnVjdCBpZWVlOAo+Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB3bC0+cHNtX3Jl
cXVlc3RlZCA9IHRydWU7Cj4KPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHdsLT5kdGltX3Blcmlv
ZCA9IGNvbmYtPnBzX2R0aW1fcGVyaW9kOwo+ICsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJl
dCA9IHdsMTI1MV9hY3hfd3JfdGJ0dF9hbmRfZHRpbSh3bCwgd2wtPmJlYWNvbl9pbnQsCj4gKyDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCB3bC0+ZHRpbV9wZXJpb2QpOwo+ICsKPiDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoC8qCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCogV2UgZW50ZXIgUFNNIG9ubHkgaWYg
d2UncmUgYWxyZWFkeSBhc3NvY2lhdGVkLgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAqIElm
IHdlJ3JlIG5vdCwgd2UnbGwgZW50ZXIgaXQgd2hlbiBqb2luaW5nIGFuIFNTSUQsCj4gLSDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCogdGhyb3VnaCB0aGUgYnNzX2luZm9fY2hhbmdlZCgpIGhvb2su
Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCogbWFjODAyMTEgZW5hYmxlcyBQU00gb25seSBp
ZiB3ZSdyZSBhbHJlYWR5IGFzc29jaWF0ZWQuCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKi8K
PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHJldCA9IHdsMTI1MV9wc19zZXRfbW9kZSh3bCwgU1RB
VElPTl9QT1dFUl9TQVZFX01PREUpOwo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgaWYgKHJldCA8
IDApCj4gQEAgLTk0Myw3ICs5NDYsNiBAQCBzdGF0aWMgdm9pZCB3bDEyNTFfb3BfYnNzX2luZm9f
Y2hhbmdlZChzCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgc3RydWN0IGllZWU4MDIxMV9ic3NfY29uZiAqYnNzX2NvbmYsCj4gwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgdTMyIGNo
YW5nZWQpCj4gwqB7Cj4gLSDCoCDCoCDCoCBlbnVtIHdsMTI1MV9jbWRfcHNfbW9kZSBtb2RlOwo+
IMKgIMKgIMKgIMKgc3RydWN0IHdsMTI1MSAqd2wgPSBody0+cHJpdjsKPiDCoCDCoCDCoCDCoHN0
cnVjdCBza19idWZmICpiZWFjb24sICpza2I7Cj4gwqAgwqAgwqAgwqBpbnQgcmV0Owo+IEBAIC05
ODQsMTEgKzk4Niw2IEBAIHN0YXRpYyB2b2lkIHdsMTI1MV9vcF9ic3NfaW5mb19jaGFuZ2VkKHMK
PiDCoCDCoCDCoCDCoGlmIChjaGFuZ2VkICYgQlNTX0NIQU5HRURfQVNTT0MpIHsKPiDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoGlmIChic3NfY29uZi0+YXNzb2MpIHsKPiDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoHdsLT5iZWFjb25faW50ID0gYnNzX2NvbmYtPmJlYWNvbl9pbnQ7
Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB3bC0+ZHRpbV9wZXJpb2QgPSBi
c3NfY29uZi0+ZHRpbV9wZXJpb2Q7Cj4gLQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgcmV0ID0gd2wxMjUxX2FjeF93cl90YnR0X2FuZF9kdGltKHdsLCB3bC0+YmVhY29uX2lu
dCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHdsLT5kdGltX3BlcmlvZCk7Cj4gLSDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB3bC0+YWlkID0gYnNzX2NvbmYtPmFpZDsK
Pgo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgc2tiID0gaWVlZTgwMjExX3Bz
cG9sbF9nZXQod2wtPmh3LCB3bC0+dmlmKTsKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoGlmICghc2tiKQo+IEBAIC0xMDAxLDE3ICs5OTgsOSBAQCBzdGF0aWMgdm9pZCB3bDEy
NTFfb3BfYnNzX2luZm9fY2hhbmdlZChzCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqBpZiAocmV0IDwgMCkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoGdvdG8gb3V0X3NsZWVwOwo+Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCByZXQgPSB3bDEyNTFfYWN4X2FpZCh3bCwgd2wtPmFpZCk7Cj4gKyDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCByZXQgPSB3bDEyNTFfYWN4X2FpZCh3bCwgYnNzX2NvbmYt
PmFpZCk7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBpZiAocmV0IDwgMCkK
PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGdvdG8gb3V0
X3NsZWVwOwo+IC0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC8qIElmIHdl
IHdhbnQgdG8gZ28gaW4gUFNNIGJ1dCB3ZSdyZSBub3QgdGhlcmUgeWV0ICovCj4gLSDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAod2wtPnBzbV9yZXF1ZXN0ZWQgJiYgIXdsLT5w
c20pIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG1v
ZGUgPSBTVEFUSU9OX1BPV0VSX1NBVkVfTU9ERTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldCA9IHdsMTI1MV9wc19zZXRfbW9kZSh3bCwgbW9kZSk7
Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAocmV0
IDwgMCkKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIGdvdG8gb3V0X3NsZWVwOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgfQo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfSBlbHNlIHsKPiDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoC8qIHVzZSBkZWZhdWx0cyB3aGVuIG5vdCBhc3NvY2lhdGVk
ICovCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB3bC0+YmVhY29uX2ludCA9
IFdMMTI1MV9ERUZBVUxUX0JFQUNPTl9JTlQ7Cj4gLS0tIHdpcmVsZXNzLXRlc3Rpbmcub3JpZy9k
cml2ZXJzL25ldC93aXJlbGVzcy9td2w4ay5jIMKgMjAxMC0wMS0yNiAwOTozNTo0MS4wMDAwMDAw
MDAgKzAxMDAKPiArKysgd2lyZWxlc3MtdGVzdGluZy9kcml2ZXJzL25ldC93aXJlbGVzcy9td2w4
ay5jIMKgIMKgIMKgIDIwMTAtMDEtMjYgMDk6MzU6NTYuMDAwMDAwMDAwICswMTAwCj4gQEAgLTM4
ODEsMTIgKzM4ODEsMTYgQEAgc3RhdGljIHZvaWQgbXdsOGtfZmluYWxpemVfam9pbl93b3JrZXIo
cwo+IMKgIMKgIMKgIMKgc3RydWN0IG13bDhrX3ByaXYgKnByaXYgPQo+IMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBtd2w4a19wcml2LCBmaW5hbGl6ZV9q
b2luX3dvcmtlcik7Cj4gwqAgwqAgwqAgwqBzdHJ1Y3Qgc2tfYnVmZiAqc2tiID0gcHJpdi0+YmVh
Y29uX3NrYjsKPiAtIMKgIMKgIMKgIHN0cnVjdCBtd2w4a192aWYgKm13bDhrX3ZpZjsKPiArIMKg
IMKgIMKgIHN0cnVjdCBpZWVlODAyMTFfbWdtdCAqbWdtdCA9ICh2b2lkICopc2tiLT5kYXRhOwo+
ICsgwqAgwqAgwqAgaW50IGxlbiA9IHNrYi0+bGVuIC0gb2Zmc2V0b2Yoc3RydWN0IGllZWU4MDIx
MV9tZ210LCB1LmJlYWNvbi52YXJpYWJsZSk7Cj4gKyDCoCDCoCDCoCBjb25zdCB1OCAqdGltID0g
Y2ZnODAyMTFfZmluZF9pZShXTEFOX0VJRF9USU0sCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG1nbXQtPnUuYmVhY29uLnZhcmlh
YmxlLCBsZW4pOwo+ICsgwqAgwqAgwqAgaW50IGR0aW1fcGVyaW9kID0gMTsKPgo+IC0gwqAgwqAg
wqAgbXdsOGtfdmlmID0gbXdsOGtfZmlyc3RfdmlmKHByaXYpOwo+IC0gwqAgwqAgwqAgaWYgKG13
bDhrX3ZpZiAhPSBOVUxMKQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgbXdsOGtfY21kX2ZpbmFs
aXplX2pvaW4ocHJpdi0+aHcsIHNrYi0+ZGF0YSwgc2tiLT5sZW4sCj4gLSDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBtd2w4a192aWYtPnZp
Zi0+YnNzX2NvbmYuZHRpbV9wZXJpb2QpOwo+ICsgwqAgwqAgwqAgaWYgKHRpbSAmJiB0aW1bMV0g
Pj0gMikKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGR0aW1fcGVyaW9kID0gdGltWzNdOwo+ICsK
PiArIMKgIMKgIMKgIG13bDhrX2NtZF9maW5hbGl6ZV9qb2luKHByaXYtPmh3LCBza2ItPmRhdGEs
IHNrYi0+bGVuLCBkdGltX3BlcmlvZCk7Cj4KPiDCoCDCoCDCoCDCoGRldl9rZnJlZV9za2Ioc2ti
KTsKPiDCoCDCoCDCoCDCoHByaXYtPmJlYWNvbl9za2IgPSBOVUxMOwo+Cj4KPiAtLQo+IFRvIHVu
c3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51
eC13aXJlbGVzcyIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIu
a2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgwqBodHRwOi8vdmdlci5rZXJuZWwu
b3JnL21ham9yZG9tby1pbmZvLmh0bWwKPgo=
On Wed, 2010-01-27 at 10:25 -0800, Luis R. Rodriguez wrote:
> On Wed, Jan 27, 2010 at 10:14 AM, Guy, Wey-Yi <[email protected]> wrote:
> > On Wed, 2010-01-27 at 10:14 -0800, Luis R. Rodriguez wrote:
> >> On Wed, Jan 27, 2010 at 10:04 AM, Guy, Wey-Yi <[email protected]> wrote:
> >> > On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
> >> >> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
> >> >> <[email protected]> wrote:
> >> >> > Because DTIM information is required for powersave
> >> >> > but is only conveyed in beacons, wait for a beacon
> >> >> > before enabling powersave, and change the way the
> >> >> > information is conveyed to the driver accordingly.
> >> >> >
> >> >> > mwl8k doesn't currently seem to implement PS but
> >> >> > requires the DTIM period in a different way; after
> >> >> > talking to Lennert we agreed to just have mwl8k do
> >> >> > the parsing itself in the finalize_join work.
> >> >>
> >> >> Not sure if this is merged yet. If not it might be good to add to the
> >> >> commit log a brief about the impact of the fix for distribution
> >> >> purposes looking to cherry pick some fixes that may cure some issues.
> >> >>
> >> >> The impact of this fix is that the DTIM settings of > 1 would now be
> >> >> respected in the odd situation a beacon would not be received prior to
> >> >> association. Ensuring we use a higher DTIM would mean saving more
> >> >> power as it would mean we can sleep longer.
> >> >>
> >> >> This is not propagated to stable but if it turns out this can enhance
> >> >> power save since DTIM might usually be > 1 and the race may be more
> >> >> common than we expected we may need a respective stable solution.
> >> >>
> >> >
> >> > It will be nice to see a respective solution for stable since this
> >> > impact power save which is very important for certain platform.
> >>
> >> Well how about your patch for stable then?
> >>
> > if ok with you and Johannes, I will like to see it happen, the only
> > issue is, my patch only address iwlwifi but not mwl8k.
>
> Oh, what was the issue with your patch and mwl8k?
>
the patch will call drv_config() and ieee80211_recal_ps()
mwl8k driver did not implement PS function, but do require dtim for
another reason
On Tue, Jan 26, 2010 at 02:19:52PM +0100, Johannes Berg wrote:
> Because DTIM information is required for powersave
> but is only conveyed in beacons, wait for a beacon
> before enabling powersave, and change the way the
> information is conveyed to the driver accordingly.
>
> mwl8k doesn't currently seem to implement PS but
> requires the DTIM period in a different way; after
> talking to Lennert we agreed to just have mwl8k do
> the parsing itself in the finalize_join work.
>
> Signed-off-by: Johannes Berg <[email protected]>
Acked-by: Lennert Buytenhek <[email protected]>
On Wed, Jan 27, 2010 at 10:04 AM, Guy, Wey-Yi <[email protected]> wrote:
> On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
>> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
>> <[email protected]> wrote:
>> > Because DTIM information is required for powersave
>> > but is only conveyed in beacons, wait for a beacon
>> > before enabling powersave, and change the way the
>> > information is conveyed to the driver accordingly.
>> >
>> > mwl8k doesn't currently seem to implement PS but
>> > requires the DTIM period in a different way; after
>> > talking to Lennert we agreed to just have mwl8k do
>> > the parsing itself in the finalize_join work.
>>
>> Not sure if this is merged yet. If not it might be good to add to the
>> commit log a brief about the impact of the fix for distribution
>> purposes looking to cherry pick some fixes that may cure some issues.
>>
>> The impact of this fix is that the DTIM settings of > 1 would now be
>> respected in the odd situation a beacon would not be received prior to
>> association. Ensuring we use a higher DTIM would mean saving more
>> power as it would mean we can sleep longer.
>>
>> This is not propagated to stable but if it turns out this can enhance
>> power save since DTIM might usually be > 1 and the race may be more
>> common than we expected we may need a respective stable solution.
>>
>
> It will be nice to see a respective solution for stable since this
> impact power save which is very important for certain platform.
Well how about your patch for stable then?
Luis
Johannes Berg <[email protected]> writes:
> Because DTIM information is required for powersave
> but is only conveyed in beacons, wait for a beacon
> before enabling powersave, and change the way the
> information is conveyed to the driver accordingly.
>
> mwl8k doesn't currently seem to implement PS but
> requires the DTIM period in a different way; after
> talking to Lennert we agreed to just have mwl8k do
> the parsing itself in the finalize_join work.
I quickly tested with wl1251 on n900, works just fine.
> Signed-off-by: Johannes Berg <[email protected]>
For the wl1251 part:
Acked-by: Kalle Valo <[email protected]>
--
Kalle Valo
On Wed, Jan 27, 2010 at 11:13:11AM -0800, Luis R. Rodriguez wrote:
> >> >> >> > Because DTIM information is required for powersave
> >> >> >> > but is only conveyed in beacons, wait for a beacon
> >> >> >> > before enabling powersave, and change the way the
> >> >> >> > information is conveyed to the driver accordingly.
> >> >> >> >
> >> >> >> > mwl8k doesn't currently seem to implement PS but
> >> >> >> > requires the DTIM period in a different way; after
> >> >> >> > talking to Lennert we agreed to just have mwl8k do
> >> >> >> > the parsing itself in the finalize_join work.
> >> >> >>
> >> >> >> Not sure if this is merged yet. If not it might be good to add to the
> >> >> >> commit log a brief about the impact of the fix for distribution
> >> >> >> purposes looking to cherry pick some fixes that may cure some issues.
> >> >> >>
> >> >> >> The impact of this fix is that the DTIM settings of > 1 would now be
> >> >> >> respected in the odd situation a beacon would not be received prior to
> >> >> >> association. Ensuring we use a higher DTIM would mean saving more
> >> >> >> power as it would mean we can sleep longer.
> >> >> >>
> >> >> >> This is not propagated to stable but if it turns out this can enhance
> >> >> >> power save since DTIM might usually be > 1 and the race may be more
> >> >> >> common than we expected we may need a respective stable solution.
> >> >> >>
> >> >> >
> >> >> > It will be nice to see a respective solution for stable since this
> >> >> > impact power save which is very important for certain platform.
> >> >>
> >> >> Well how about your patch for stable then?
> >> >>
> >> > if ok with you and Johannes, I will like to see it happen, the only
> >> > issue is, my patch only address iwlwifi but not mwl8k.
> >>
> >> Oh, what was the issue with your patch and mwl8k?
> >>
> > the patch will call drv_config() and ieee80211_recal_ps()
> > mwl8k driver did not implement PS function, but do require dtim for
> > another reason
>
> Lennert, why does it need it if it does not implement the PS function?
> Firmware API? What would happen if its not passed?
As long as client PS isn't implemented, it should be fine to just pass
1 into the FINALIZE_JOIN command.
On Wed, Jan 27, 2010 at 10:01:00AM -0800, Luis R. Rodriguez wrote:
> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
> <[email protected]> wrote:
> > Because DTIM information is required for powersave
> > but is only conveyed in beacons, wait for a beacon
> > before enabling powersave, and change the way the
> > information is conveyed to the driver accordingly.
> >
> > mwl8k doesn't currently seem to implement PS but
> > requires the DTIM period in a different way; after
> > talking to Lennert we agreed to just have mwl8k do
> > the parsing itself in the finalize_join work.
>
> Not sure if this is merged yet. If not it might be good to add to the
> commit log a brief about the impact of the fix for distribution
> purposes looking to cherry pick some fixes that may cure some issues.
It's already merged...
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Wed, 2010-01-27 at 10:14 -0800, Guy, Wey-Yi wrote:
> > > It will be nice to see a respective solution for stable since this
> > > impact power save which is very important for certain platform.
> >
> > Well how about your patch for stable then?
> >
> if ok with you and Johannes, I will like to see it happen, the only
> issue is, my patch only address iwlwifi but not mwl8k.
It might be possible to port this patch to stable by changing the way we
determine whether or not we received a beacon already -- it currently
relies on Jouni's cfg80211 change (look for beacon_ies) but that could
be changed, for instance to use the dtim_period in the BSS struct as a
flag.
johannes
On Wed, Jan 27, 2010 at 10:14 AM, Guy, Wey-Yi <[email protected]> wrote:
> On Wed, 2010-01-27 at 10:14 -0800, Luis R. Rodriguez wrote:
>> On Wed, Jan 27, 2010 at 10:04 AM, Guy, Wey-Yi <[email protected]> wrote:
>> > On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
>> >> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
>> >> <[email protected]> wrote:
>> >> > Because DTIM information is required for powersave
>> >> > but is only conveyed in beacons, wait for a beacon
>> >> > before enabling powersave, and change the way the
>> >> > information is conveyed to the driver accordingly.
>> >> >
>> >> > mwl8k doesn't currently seem to implement PS but
>> >> > requires the DTIM period in a different way; after
>> >> > talking to Lennert we agreed to just have mwl8k do
>> >> > the parsing itself in the finalize_join work.
>> >>
>> >> Not sure if this is merged yet. If not it might be good to add to the
>> >> commit log a brief about the impact of the fix for distribution
>> >> purposes looking to cherry pick some fixes that may cure some issues.
>> >>
>> >> The impact of this fix is that the DTIM settings of > 1 would now be
>> >> respected in the odd situation a beacon would not be received prior to
>> >> association. Ensuring we use a higher DTIM would mean saving more
>> >> power as it would mean we can sleep longer.
>> >>
>> >> This is not propagated to stable but if it turns out this can enhance
>> >> power save since DTIM might usually be > 1 and the race may be more
>> >> common than we expected we may need a respective stable solution.
>> >>
>> >
>> > It will be nice to see a respective solution for stable since this
>> > impact power save which is very important for certain platform.
>>
>> Well how about your patch for stable then?
>>
> if ok with you and Johannes, I will like to see it happen, the only
> issue is, my patch only address iwlwifi but not mwl8k.
Oh, what was the issue with your patch and mwl8k?
Luis
On Wed, Jan 27, 2010 at 10:59 AM, Guy, Wey-Yi <[email protected]> wrote:
> On Wed, 2010-01-27 at 10:25 -0800, Luis R. Rodriguez wrote:
>> On Wed, Jan 27, 2010 at 10:14 AM, Guy, Wey-Yi <[email protected]> wrote:
>> > On Wed, 2010-01-27 at 10:14 -0800, Luis R. Rodriguez wrote:
>> >> On Wed, Jan 27, 2010 at 10:04 AM, Guy, Wey-Yi <[email protected]> wrote:
>> >> > On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
>> >> >> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
>> >> >> <[email protected]> wrote:
>> >> >> > Because DTIM information is required for powersave
>> >> >> > but is only conveyed in beacons, wait for a beacon
>> >> >> > before enabling powersave, and change the way the
>> >> >> > information is conveyed to the driver accordingly.
>> >> >> >
>> >> >> > mwl8k doesn't currently seem to implement PS but
>> >> >> > requires the DTIM period in a different way; after
>> >> >> > talking to Lennert we agreed to just have mwl8k do
>> >> >> > the parsing itself in the finalize_join work.
>> >> >>
>> >> >> Not sure if this is merged yet. If not it might be good to add to the
>> >> >> commit log a brief about the impact of the fix for distribution
>> >> >> purposes looking to cherry pick some fixes that may cure some issues.
>> >> >>
>> >> >> The impact of this fix is that the DTIM settings of > 1 would now be
>> >> >> respected in the odd situation a beacon would not be received prior to
>> >> >> association. Ensuring we use a higher DTIM would mean saving more
>> >> >> power as it would mean we can sleep longer.
>> >> >>
>> >> >> This is not propagated to stable but if it turns out this can enhance
>> >> >> power save since DTIM might usually be > 1 and the race may be more
>> >> >> common than we expected we may need a respective stable solution.
>> >> >>
>> >> >
>> >> > It will be nice to see a respective solution for stable since this
>> >> > impact power save which is very important for certain platform.
>> >>
>> >> Well how about your patch for stable then?
>> >>
>> > if ok with you and Johannes, I will like to see it happen, the only
>> > issue is, my patch only address iwlwifi but not mwl8k.
>>
>> Oh, what was the issue with your patch and mwl8k?
>>
> the patch will call drv_config() and ieee80211_recal_ps()
> mwl8k driver did not implement PS function, but do require dtim for
> another reason
Lennert, why does it need it if it does not implement the PS function?
Firmware API? What would happen if its not passed?
Luis
On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
> <[email protected]> wrote:
> > Because DTIM information is required for powersave
> > but is only conveyed in beacons, wait for a beacon
> > before enabling powersave, and change the way the
> > information is conveyed to the driver accordingly.
> >
> > mwl8k doesn't currently seem to implement PS but
> > requires the DTIM period in a different way; after
> > talking to Lennert we agreed to just have mwl8k do
> > the parsing itself in the finalize_join work.
>
> Not sure if this is merged yet. If not it might be good to add to the
> commit log a brief about the impact of the fix for distribution
> purposes looking to cherry pick some fixes that may cure some issues.
>
> The impact of this fix is that the DTIM settings of > 1 would now be
> respected in the odd situation a beacon would not be received prior to
> association. Ensuring we use a higher DTIM would mean saving more
> power as it would mean we can sleep longer.
>
> This is not propagated to stable but if it turns out this can enhance
> power save since DTIM might usually be > 1 and the race may be more
> common than we expected we may need a respective stable solution.
>
It will be nice to see a respective solution for stable since this
impact power save which is very important for certain platform.
>
> > Signed-off-by: Johannes Berg <[email protected]>
> > ---
> > The mwl8k part requires the cfg80211 change.
> >
> > drivers/net/wireless/iwlwifi/iwl-power.c | 2 +-
> > drivers/net/wireless/mwl8k.c | 14 +++++++++-----
> > drivers/net/wireless/wl12xx/wl1251.h | 3 ---
> > drivers/net/wireless/wl12xx/wl1251_main.c | 25 +++++++------------------
> > include/net/mac80211.h | 7 ++++++-
> > net/mac80211/mlme.c | 27 ++++++++++++++++++++++++---
> > net/mac80211/scan.c | 4 ----
> > 7 files changed, 47 insertions(+), 35 deletions(-)
> >
> > --- wireless-testing.orig/include/net/mac80211.h 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/include/net/mac80211.h 2010-01-26 09:35:50.000000000 +0100
> > @@ -186,7 +186,8 @@ enum ieee80211_bss_change {
> > * @use_short_slot: use short slot time (only relevant for ERP);
> > * if the hardware cannot handle this it must set the
> > * IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
> > - * @dtim_period: num of beacons before the next DTIM, for PSM
> > + * @dtim_period: num of beacons before the next DTIM, for beaconing,
> > + * not valid in station mode (cf. hw conf ps_dtim_period)
> > * @timestamp: beacon timestamp
> > * @beacon_int: beacon interval
> > * @assoc_capability: capabilities taken from assoc resp
> > @@ -652,6 +653,9 @@ enum ieee80211_smps_mode {
> > * value will be only achievable between DTIM frames, the hardware
> > * needs to check for the multicast traffic bit in DTIM beacons.
> > * This variable is valid only when the CONF_PS flag is set.
> > + * @ps_dtim_period: The DTIM period of the AP we're connected to, for use
> > + * in power saving. Power saving will not be enabled until a beacon
> > + * has been received and the DTIM period is known.
> > * @dynamic_ps_timeout: The dynamic powersave timeout (in ms), see the
> > * powersave documentation below. This variable is valid only when
> > * the CONF_PS flag is set.
> > @@ -678,6 +682,7 @@ struct ieee80211_conf {
> > int max_sleep_period;
> >
> > u16 listen_interval;
> > + u8 ps_dtim_period;
> >
> > u8 long_frame_max_tx_count, short_frame_max_tx_count;
> >
> > --- wireless-testing.orig/net/mac80211/mlme.c 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/net/mac80211/mlme.c 2010-01-26 09:35:50.000000000 +0100
> > @@ -480,6 +480,7 @@ void ieee80211_recalc_ps(struct ieee8021
> >
> > if (count == 1 && found->u.mgd.powersave &&
> > found->u.mgd.associated &&
> > + found->u.mgd.associated->beacon_ies &&
> > !(found->u.mgd.flags & (IEEE80211_STA_BEACON_POLL |
> > IEEE80211_STA_CONNECTION_POLL))) {
> > s32 beaconint_us;
> > @@ -493,14 +494,22 @@ void ieee80211_recalc_ps(struct ieee8021
> > if (beaconint_us > latency) {
> > local->ps_sdata = NULL;
> > } else {
> > - u8 dtimper = found->vif.bss_conf.dtim_period;
> > + struct ieee80211_bss *bss;
> > int maxslp = 1;
> > + u8 dtimper;
> >
> > - if (dtimper > 1)
> > + bss = (void *)found->u.mgd.associated->priv;
> > + dtimper = bss->dtim_period;
> > +
> > + /* If the TIM IE is invalid, pretend the value is 1 */
> > + if (!dtimper)
> > + dtimper = 1;
> > + else if (dtimper > 1)
> > maxslp = min_t(int, dtimper,
> > latency / beaconint_us);
> >
> > local->hw.conf.max_sleep_period = maxslp;
> > + local->hw.conf.ps_dtim_period = dtimper;
> > local->ps_sdata = found;
> > }
> > } else {
> > @@ -698,7 +707,6 @@ static void ieee80211_set_associated(str
> > /* set timing information */
> > sdata->vif.bss_conf.beacon_int = cbss->beacon_interval;
> > sdata->vif.bss_conf.timestamp = cbss->tsf;
> > - sdata->vif.bss_conf.dtim_period = bss->dtim_period;
> >
> > bss_info_changed |= BSS_CHANGED_BEACON_INT;
> > bss_info_changed |= ieee80211_handle_bss_capability(sdata,
> > @@ -1164,6 +1172,13 @@ static void ieee80211_rx_bss_info(struct
> > int freq;
> > struct ieee80211_bss *bss;
> > struct ieee80211_channel *channel;
> > + bool need_ps = false;
> > +
> > + if (sdata->u.mgd.associated) {
> > + bss = (void *)sdata->u.mgd.associated->priv;
> > + /* not previously set so we may need to recalc */
> > + need_ps = !bss->dtim_period;
> > + }
> >
> > if (elems->ds_params && elems->ds_params_len == 1)
> > freq = ieee80211_channel_to_frequency(elems->ds_params[0]);
> > @@ -1183,6 +1198,12 @@ static void ieee80211_rx_bss_info(struct
> > if (!sdata->u.mgd.associated)
> > return;
> >
> > + if (need_ps) {
> > + mutex_lock(&local->iflist_mtx);
> > + ieee80211_recalc_ps(local, -1);
> > + mutex_unlock(&local->iflist_mtx);
> > + }
> > +
> > if (elems->ch_switch_elem && (elems->ch_switch_elem_len == 3) &&
> > (memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid,
> > ETH_ALEN) == 0)) {
> > --- wireless-testing.orig/net/mac80211/scan.c 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/net/mac80211/scan.c 2010-01-26 09:35:50.000000000 +0100
> > @@ -111,10 +111,6 @@ ieee80211_bss_info_update(struct ieee802
> > bss->dtim_period = tim_ie->dtim_period;
> > }
> >
> > - /* set default value for buggy AP/no TIM element */
> > - if (bss->dtim_period == 0)
> > - bss->dtim_period = 1;
> > -
> > bss->supp_rates_len = 0;
> > if (elems->supp_rates) {
> > clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
> > --- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-power.c 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-power.c 2010-01-26 09:35:50.000000000 +0100
> > @@ -319,7 +319,7 @@ int iwl_power_update_mode(struct iwl_pri
> > priv->chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE;
> >
> > if (priv->vif)
> > - dtimper = priv->vif->bss_conf.dtim_period;
> > + dtimper = priv->hw->conf.ps_dtim_period;
> > else
> > dtimper = 1;
> >
> > --- wireless-testing.orig/drivers/net/wireless/wl12xx/wl1251.h 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/drivers/net/wireless/wl12xx/wl1251.h 2010-01-26 09:35:50.000000000 +0100
> > @@ -341,9 +341,6 @@ struct wl1251 {
> > /* Are we currently scanning */
> > bool scanning;
> >
> > - /* Our association ID */
> > - u16 aid;
> > -
> > /* Default key (for WEP) */
> > u32 default_key;
> >
> > --- wireless-testing.orig/drivers/net/wireless/wl12xx/wl1251_main.c 2010-01-26 09:35:35.000000000 +0100
> > +++ wireless-testing/drivers/net/wireless/wl12xx/wl1251_main.c 2010-01-26 09:35:50.000000000 +0100
> > @@ -617,10 +617,13 @@ static int wl1251_op_config(struct ieee8
> >
> > wl->psm_requested = true;
> >
> > + wl->dtim_period = conf->ps_dtim_period;
> > +
> > + ret = wl1251_acx_wr_tbtt_and_dtim(wl, wl->beacon_int,
> > + wl->dtim_period);
> > +
> > /*
> > - * We enter PSM only if we're already associated.
> > - * If we're not, we'll enter it when joining an SSID,
> > - * through the bss_info_changed() hook.
> > + * mac80211 enables PSM only if we're already associated.
> > */
> > ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
> > if (ret < 0)
> > @@ -943,7 +946,6 @@ static void wl1251_op_bss_info_changed(s
> > struct ieee80211_bss_conf *bss_conf,
> > u32 changed)
> > {
> > - enum wl1251_cmd_ps_mode mode;
> > struct wl1251 *wl = hw->priv;
> > struct sk_buff *beacon, *skb;
> > int ret;
> > @@ -984,11 +986,6 @@ static void wl1251_op_bss_info_changed(s
> > if (changed & BSS_CHANGED_ASSOC) {
> > if (bss_conf->assoc) {
> > wl->beacon_int = bss_conf->beacon_int;
> > - wl->dtim_period = bss_conf->dtim_period;
> > -
> > - ret = wl1251_acx_wr_tbtt_and_dtim(wl, wl->beacon_int,
> > - wl->dtim_period);
> > - wl->aid = bss_conf->aid;
> >
> > skb = ieee80211_pspoll_get(wl->hw, wl->vif);
> > if (!skb)
> > @@ -1001,17 +998,9 @@ static void wl1251_op_bss_info_changed(s
> > if (ret < 0)
> > goto out_sleep;
> >
> > - ret = wl1251_acx_aid(wl, wl->aid);
> > + ret = wl1251_acx_aid(wl, bss_conf->aid);
> > if (ret < 0)
> > goto out_sleep;
> > -
> > - /* If we want to go in PSM but we're not there yet */
> > - if (wl->psm_requested && !wl->psm) {
> > - mode = STATION_POWER_SAVE_MODE;
> > - ret = wl1251_ps_set_mode(wl, mode);
> > - if (ret < 0)
> > - goto out_sleep;
> > - }
> > } else {
> > /* use defaults when not associated */
> > wl->beacon_int = WL1251_DEFAULT_BEACON_INT;
> > --- wireless-testing.orig/drivers/net/wireless/mwl8k.c 2010-01-26 09:35:41.000000000 +0100
> > +++ wireless-testing/drivers/net/wireless/mwl8k.c 2010-01-26 09:35:56.000000000 +0100
> > @@ -3881,12 +3881,16 @@ static void mwl8k_finalize_join_worker(s
> > struct mwl8k_priv *priv =
> > container_of(work, struct mwl8k_priv, finalize_join_worker);
> > struct sk_buff *skb = priv->beacon_skb;
> > - struct mwl8k_vif *mwl8k_vif;
> > + struct ieee80211_mgmt *mgmt = (void *)skb->data;
> > + int len = skb->len - offsetof(struct ieee80211_mgmt, u.beacon.variable);
> > + const u8 *tim = cfg80211_find_ie(WLAN_EID_TIM,
> > + mgmt->u.beacon.variable, len);
> > + int dtim_period = 1;
> >
> > - mwl8k_vif = mwl8k_first_vif(priv);
> > - if (mwl8k_vif != NULL)
> > - mwl8k_cmd_finalize_join(priv->hw, skb->data, skb->len,
> > - mwl8k_vif->vif->bss_conf.dtim_period);
> > + if (tim && tim[1] >= 2)
> > + dtim_period = tim[3];
> > +
> > + mwl8k_cmd_finalize_join(priv->hw, skb->data, skb->len, dtim_period);
> >
> > dev_kfree_skb(skb);
> > priv->beacon_skb = NULL;
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
On Wed, 2010-01-27 at 10:14 -0800, Luis R. Rodriguez wrote:
> On Wed, Jan 27, 2010 at 10:04 AM, Guy, Wey-Yi <[email protected]> wrote:
> > On Wed, 2010-01-27 at 10:01 -0800, Luis R. Rodriguez wrote:
> >> On Tue, Jan 26, 2010 at 5:19 AM, Johannes Berg
> >> <[email protected]> wrote:
> >> > Because DTIM information is required for powersave
> >> > but is only conveyed in beacons, wait for a beacon
> >> > before enabling powersave, and change the way the
> >> > information is conveyed to the driver accordingly.
> >> >
> >> > mwl8k doesn't currently seem to implement PS but
> >> > requires the DTIM period in a different way; after
> >> > talking to Lennert we agreed to just have mwl8k do
> >> > the parsing itself in the finalize_join work.
> >>
> >> Not sure if this is merged yet. If not it might be good to add to the
> >> commit log a brief about the impact of the fix for distribution
> >> purposes looking to cherry pick some fixes that may cure some issues.
> >>
> >> The impact of this fix is that the DTIM settings of > 1 would now be
> >> respected in the odd situation a beacon would not be received prior to
> >> association. Ensuring we use a higher DTIM would mean saving more
> >> power as it would mean we can sleep longer.
> >>
> >> This is not propagated to stable but if it turns out this can enhance
> >> power save since DTIM might usually be > 1 and the race may be more
> >> common than we expected we may need a respective stable solution.
> >>
> >
> > It will be nice to see a respective solution for stable since this
> > impact power save which is very important for certain platform.
>
> Well how about your patch for stable then?
>
if ok with you and Johannes, I will like to see it happen, the only
issue is, my patch only address iwlwifi but not mwl8k.