On Thu, Nov 26, 2009 at 1:37 PM, Kalle Valo <kalle.valo@xxxxxx> wrote:
> Vivek Natarajan <vnatarajan@xxxxxxxxxxx> writes:
>> @@ -746,6 +746,7 @@ struct ieee80211_local {
>> unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
>>
>> bool pspolling;
>> + bool scan_ps_enabled;
>
> I don't like the idea of adding more state variables to
> ieee80211_local. We should be removing them instead because the code
> is getting quite complex. Is there any way to fix this but not add a
> new variable?
>
In this case, I need a variable to store the PS state before scan so
that I can restore the same state when we come back to home channel.
There are only two variables relating to this context:
the flag IEEE80211_CONF_PS and ps_sdata
CONF_PS flag is getting changed in scan_ps_enable.
After association, ps_sdata is always set since power save is enabled
by default.
This will be changed if the power save is disabled through iwconfig
which may happen during scan too. Hence I cannot use this too.
So, I had to introduce a new variable.
>> @@ -277,6 +279,10 @@ static void ieee80211_scan_ps_disable(struct ieee80211_sub_if_data *sdata)
>> */
>> local->hw.conf.flags |= IEEE80211_CONF_PS;
>> ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
>> + } else {
>> + ieee80211_send_nullfunc(local, sdata, 0);
>> + mod_timer(&local->dynamic_ps_timer, jiffies +
>> + msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
>> }
>> }
>
> You need to take into account that dynamic_ps_timeout can be zero.
When dynamic_ps_timeout is zero, as soon as the station is associated,
CONF_PS will be set and communicated to the driver.
If a scan request comes in this period, there will be a issue with my
fix. I think this is the case you are pointing at. If so, I think the
following chunk will work:
@@ -277,6 +279,10 @@ static void ieee80211_scan_ps_disable(struct
ieee80211_sub_if_data *sdata)
*/
local->hw.conf.flags |= IEEE80211_CONF_PS;
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+ } else if (local->hw.conf.dynamic_ps_timeout > 0){
+ ieee80211_send_nullfunc(local, sdata, 0);
+ mod_timer(&local->dynamic_ps_timer, jiffies +
+ msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
}
}
Vivek.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
