1 files changed, 8 insertions, 1 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a7b92f5f7161..efa41fc66c1f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2817,6 +2817,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
         u16 capab_info, status_code, aid;
         struct ieee802_11_elems elems;
+        int ac, uapsd_queues = -1;
         u8 *pos;
         bool reassoc;
         struct cfg80211_bss *bss;
@@ -2886,9 +2887,15 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                  * is set can cause the interface to go idle
                  */
                 ieee80211_destroy_assoc_data(sdata, true);
+
+                /* get uapsd queues configuration */
+                uapsd_queues = 0;
+                for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+                        if (sdata->tx_conf[ac].uapsd)
+                                uapsd_queues |= BIT(ac);
         }
 
-        cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len);
+        cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len, uapsd_queues);
 }
 
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,