On Tue, 2010-06-01 at 10:00 +0200, ext Johannes Berg wrote:
> On Mon, 2010-05-31 at 10:05 +0300, Juuso Oikarinen wrote:
>
> > /**
> > + * ieee80211_disable_dyn_ps - force mac80211 to temporarily disable dynamic psm
> > + *
> > + * @vif: &struct ieee80211_vif pointer from the add_interface callback.
>
> * @disable: ...
>
> The name is also a bit odd since you can re-enable it, but I can't think
> of a better name either.
I'll try to come up with a better name. If I cannot, I'll leave it as it
is.
> > --- a/net/mac80211/mlme.c
> > +++ b/net/mac80211/mlme.c
> > @@ -478,6 +478,24 @@ static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
> > }
> > }
> >
> > +void ieee80211_disable_dyn_ps(struct ieee80211_vif *vif, bool disable)
> > +{
> > + struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
> > + struct ieee80211_local *local = sdata->local;
> > +
> > + WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION);
> > +
> > + sdata->disable_dyn_ps = disable;
> > +
> > + /* immediately go to psm */
> > + if (disable && timer_pending(&local->dynamic_ps_timer)) {
> > + ieee80211_queue_work(&local->hw,
> > + &local->dynamic_ps_enable_work);
> > + del_timer_sync(&local->dynamic_ps_timer);
> > + }
> > +}
>
> The timer trickery seems weird, why not just queue the work and ignore
> the timer?
It's there for the obvious reason - it just saves an extra execution of
the dynamic_ps_enable_work. That said, maybe the saving is not worth the
added complexity.
> > - if (conf->dynamic_ps_timeout > 0 &&
> > + if (conf->dynamic_ps_timeout > 0 && !sdata->disable_dyn_ps &&
>
> As we just discussed on IRC, it might be worthwhile to adjust
> dynamic_ps_timeout to 0 instead in this case, so this and the RX and TX
> paths need not be touched.
Yes, as we discussed I'll change this to adjusting the
dynamic_ps_timeout to zero, and using a separate variable to track the
actual value of the timer.
-Juuso
> johannes
>
--
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
