From: Vivek Natarajan Date: Fri, 18 Feb 2011 11:48:03 +0000 (+0530) Subject: mac80211: Clear PS related flag on disabling power save. X-Git-Tag: v2.6.39-rc1~468^2~25^2^2~169 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db28569adc692d9fb8a2d2d8e7ebab7fd5481f10;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Signed-off-by: John W. Linville --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 38e5939..d0f91d7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -236,6 +236,7 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx) if (local->hw.conf.flags & IEEE80211_CONF_PS) { ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_QUEUE_STOP_REASON_PS); + ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED; ieee80211_queue_work(&local->hw, &local->dynamic_ps_disable_work); }