1 files changed, 8 insertions, 1 deletions

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 0e936233dac5..cb119d3b6353 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -509,9 +509,14 @@ static void ieee80211_set_associated(struct net_device *dev,
                                            conf->channel->center_freq,
                                            ifsta->ssid, ifsta->ssid_len);
                 if (bss) {
+                        /* set timing information */
+                        sdata->bss_conf.beacon_int = bss->beacon_int;
+                        sdata->bss_conf.timestamp = bss->timestamp;
+
                         if (bss->has_erp_value)
                                 changed |= ieee80211_handle_erp_ie(
                                                 sdata, bss->erp_value);
+
                         ieee80211_rx_bss_put(dev, bss);
                 }
 
@@ -2033,8 +2038,10 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         } else
                 rcu_read_unlock();
 
-        /* set AID, ieee80211_set_associated() will tell the driver */
+        /* set AID and assoc capability,
+         * ieee80211_set_associated() will tell the driver */
         bss_conf->aid = aid;
+        bss_conf->assoc_capability = capab_info;
         ieee80211_set_associated(dev, ifsta, 1);
 
         ieee80211_associated(dev, ifsta);