On Wed, 2009-04-22 at 23:02 +0200, Johannes Berg wrote: > When somebody changes the PS parameters while scanning > is in progress, we enable PS -- during the scan. This > is clearly not desirable, and we can just abort enabling > PS when scanning since when the scan finishes it will > be taken care of. John, did this fall through the cracks? I see you included a patch from today but not this :) johannes > Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > --- > net/mac80211/mlme.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > --- wireless-testing.orig/net/mac80211/mlme.c 2009-04-22 22:57:45.000000000 +0200 > +++ wireless-testing/net/mac80211/mlme.c 2009-04-22 22:58:56.000000000 +0200 > @@ -487,6 +487,13 @@ static void ieee80211_enable_ps(struct i > { > struct ieee80211_conf *conf = &local->hw.conf; > > + /* > + * If we are scanning right now then the parameters will > + * take effect when scan finishes. > + */ > + if (local->hw_scanning || local->sw_scanning) > + return; > + > if (conf->dynamic_ps_timeout > 0 && > !(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)) { > mod_timer(&local->dynamic_ps_timer, jiffies + > > > -- > 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 >
Attachment:
signature.asc
Description: This is a digitally signed message part