linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] mac80211: Clear PS related flag on disabling power save.
@ 2011-02-18  8:48 Vivek Natarajan
  2011-02-18 11:05 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Vivek Natarajan @ 2011-02-18  8:48 UTC (permalink / raw)
  To: linville; +Cc: linux-wireless, johannes

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 <vnatarajan@atheros.com>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/2] mac80211: Clear PS related flag on disabling power save.
  2011-02-18  8:48 [PATCH 2/2] mac80211: Clear PS related flag on disabling power save Vivek Natarajan
@ 2011-02-18 11:05 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2011-02-18 11:05 UTC (permalink / raw)
  To: Vivek Natarajan; +Cc: linville, linux-wireless

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 <vnatarajan@atheros.com>


>  		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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-02-18 11:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-18  8:48 [PATCH 2/2] mac80211: Clear PS related flag on disabling power save Vivek Natarajan
2011-02-18 11:05 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).