diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-11-16 07:34:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 15:45:15 -0500 |
commit | fcac4fb00eaefea375db9745464cc182389a1751 (patch) | |
tree | d1273395ac9e5798c6b79b870a72e560ee215a59 /net/mac80211/offchannel.c | |
parent | 1f80c230a7d291a10045a3cdc2efd18a4185674d (diff) |
mac80211: call ieee80211_recalc_idle() after sending packets
Some drivers (e.g. ath9k) assume that it's safe to go into low-power mode
immediately after the idle state changes. To support that, mac80211 even
calls drv_flush() before that happens.
In some instances, mac80211 sent a packet right after recalculating the
idle state, this patch fixes that.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/offchannel.c')
-rw-r--r-- | net/mac80211/offchannel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 13427b194ced..767d26b3f98b 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
@@ -211,8 +211,6 @@ static void ieee80211_hw_roc_start(struct work_struct *work) | |||
211 | return; | 211 | return; |
212 | } | 212 | } |
213 | 213 | ||
214 | ieee80211_recalc_idle(local); | ||
215 | |||
216 | if (local->hw_roc_skb) { | 214 | if (local->hw_roc_skb) { |
217 | sdata = IEEE80211_DEV_TO_SUB_IF(local->hw_roc_dev); | 215 | sdata = IEEE80211_DEV_TO_SUB_IF(local->hw_roc_dev); |
218 | ieee80211_tx_skb(sdata, local->hw_roc_skb); | 216 | ieee80211_tx_skb(sdata, local->hw_roc_skb); |
@@ -226,6 +224,8 @@ static void ieee80211_hw_roc_start(struct work_struct *work) | |||
226 | GFP_KERNEL); | 224 | GFP_KERNEL); |
227 | } | 225 | } |
228 | 226 | ||
227 | ieee80211_recalc_idle(local); | ||
228 | |||
229 | mutex_unlock(&local->mtx); | 229 | mutex_unlock(&local->mtx); |
230 | } | 230 | } |
231 | 231 | ||