2011-02-18 08:48:31

by Vivek Natarajan

Subject: [PATCH 2/2] mac80211: Clear PS related flag on disabling power save.

Clear IEEE80211_STA_NULLFUNC_ACKED flag on disabling power
save. Without this fix, there is a chance of setting CONF_PS
before sending nullfunc frame.

Signed-off-by: Vivek Natarajan <[email protected]>
---
net/mac80211/tx.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 17ef4f4..4b88edf 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -238,6 +238,7 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
IEEE80211_QUEUE_STOP_REASON_PS);
ieee80211_queue_work(&local->hw,
&local->dynamic_ps_disable_work);
+ ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;
}

mod_timer(&local->dynamic_ps_timer, jiffies +
--
1.6.3.3

2011-02-18 11:05:34

by Johannes Berg

Subject: Re: [PATCH 2/2] mac80211: Clear PS related flag on disabling power save.

On Fri, 2011-02-18 at 14:18 +0530, Vivek Natarajan wrote:
> Clear IEEE80211_STA_NULLFUNC_ACKED flag on disabling power
> save. Without this fix, there is a chance of setting CONF_PS
> before sending nullfunc frame.
>
> Signed-off-by: Vivek Natarajan <[email protected]>


> ieee80211_queue_work(&local->hw,
> &local->dynamic_ps_disable_work);
> + ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;

Shouldn't those be the other way around, just to make reading easier?

johannes