diff options
| author | Vivek Natarajan <vnatarajan@atheros.com> | 2011-02-18 17:18:03 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:54:57 -0500 |
| commit | db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (patch) | |
| tree | 2e16f74ef5c73bc0735f43bc223c4330c57e1108 | |
| parent | 1a63e2ce4e67f6df74f032ec302314141816e432 (diff) | |
| download | linux-stable-db28569adc692d9fb8a2d2d8e7ebab7fd5481f10.tar.gz linux-stable-db28569adc692d9fb8a2d2d8e7ebab7fd5481f10.tar.bz2 linux-stable-db28569adc692d9fb8a2d2d8e7ebab7fd5481f10.zip | |
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 <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | 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 38e593939727..d0f91d74eaf0 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); } |