From a3322179094ca02e5812bfb45231ee9c5ee10f0c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 29 Oct 2009 12:19:21 +0100 Subject: [PATCH] --- yaml --- r: 171349 b: refs/heads/master c: 62b517cb3e974624a2958ad0b603ebb59cd96e16 h: refs/heads/master i: 171347: 947d7124217b08c1a8d569ba5dd8cce9e2d8b9d1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9f3af31b136e..113de1e7d710 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c27f2fded51948edf40007f4f31350e9e0c6ba23 +refs/heads/master: 62b517cb3e974624a2958ad0b603ebb59cd96e16 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 8595d14c774c..844609c23268 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -317,12 +317,11 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx) if (!atomic_read(&tx->sdata->bss->num_sta_ps)) return TX_CONTINUE; - /* buffered in hardware */ - if (!(tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)) { - info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM; + info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM; + /* device releases frame after DTIM beacon */ + if (!(tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)) return TX_CONTINUE; - } /* buffered in mac80211 */ if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)