mac80211: invoke set_tim() callback after setting own TIM info

Drivers should be allowed to simply get a complete new beacon when
set_tim() is invoked (and set_tim() is required for drivers that
just want a beacon template!), so we need to update our own TIM
bitmap before calling set_tim() so that getting the beacon will
now get an already updated beacon.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c4b7cc07315d..af606f715016 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -600,10 +600,10 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
                 atomic_dec(&sdata->bss->num_sta_ps);
         sta->flags &= ~(WLAN_STA_PS | WLAN_STA_TIM | WLAN_STA_PSPOLL);
         if (!skb_queue_empty(&sta->ps_tx_buf)) {
-                if (local->ops->set_tim)
-                        local->ops->set_tim(local_to_hw(local), sta->aid, 0);
                 if (sdata->bss)
                         bss_tim_clear(local, sdata->bss, sta->aid);
+                if (local->ops->set_tim)
+                        local->ops->set_tim(local_to_hw(local), sta->aid, 0);
         }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         printk(KERN_DEBUG "%s: STA %s aid %d exits power save mode\n",
@@ -947,11 +947,11 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
                 dev_queue_xmit(skb);
 
                 if (no_pending_pkts) {
+                        if (rx->sdata->bss)
+                                bss_tim_clear(rx->local, rx->sdata->bss, rx->sta->aid);
                         if (rx->local->ops->set_tim)
                                 rx->local->ops->set_tim(local_to_hw(rx->local),
                                                        rx->sta->aid, 0);
-                        if (rx->sdata->bss)
-                                bss_tim_clear(rx->local, rx->sdata->bss, rx->sta->aid);
                 }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         } else if (!rx->u.rx.sent_ps_buffered) {
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 746bbdea6b4c..cbe00979e444 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -396,11 +396,11 @@ void sta_info_remove_aid_ptr(struct sta_info *sta)
 
         sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
 
+        if (sdata->bss)
+                __bss_tim_clear(sdata->bss, sta->aid);
         if (sdata->local->ops->set_tim)
                 sdata->local->ops->set_tim(local_to_hw(sdata->local),
                                           sta->aid, 0);
-        if (sdata->bss)
-                __bss_tim_clear(sdata->bss, sta->aid);
 }
 
 
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;