1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4f951e78df15..82474a8f251b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -419,11 +419,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
                         tx->local->total_ps_buffered++;
                 /* Queue frame to be sent after STA sends an PS Poll frame */
                 if (skb_queue_empty(&sta->ps_tx_buf)) {
+                        if (tx->sdata->bss)
+                                bss_tim_set(tx->local, tx->sdata->bss, sta->aid);
                         if (tx->local->ops->set_tim)
                                 tx->local->ops->set_tim(local_to_hw(tx->local),
                                                        sta->aid, 1);
-                        if (tx->sdata->bss)
-                                bss_tim_set(tx->local, tx->sdata->bss, sta->aid);
                 }
                 pkt_data = (struct ieee80211_tx_packet_data *)tx->skb->cb;
                 pkt_data->jiffies = jiffies;