1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index d469d3dcd054..595f0f94d16e 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -1143,6 +1143,7 @@ static struct ieee80211_channel wl1251_channels[] = {
 static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue,
                              const struct ieee80211_tx_queue_params *params)
 {
+        enum wl1251_acx_ps_scheme ps_scheme;
         struct wl1251 *wl = hw->priv;
         int ret;
 
@@ -1160,10 +1161,14 @@ static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue,
         if (ret < 0)
                 goto out_sleep;
 
+        if (params->uapsd)
+                ps_scheme = WL1251_ACX_PS_SCHEME_UPSD_TRIGGER;
+        else
+                ps_scheme = WL1251_ACX_PS_SCHEME_LEGACY;
+
         ret = wl1251_acx_tid_cfg(wl, wl1251_tx_get_queue(queue),
                                  CHANNEL_TYPE_EDCF,
-                                 wl1251_tx_get_queue(queue),
-                                 WL1251_ACX_PS_SCHEME_LEGACY,
+                                 wl1251_tx_get_queue(queue), ps_scheme,
                                  WL1251_ACX_ACK_POLICY_LEGACY);
         if (ret < 0)
                 goto out_sleep;
@@ -1237,7 +1242,8 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
         wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
                 IEEE80211_HW_NOISE_DBM |
                 IEEE80211_HW_SUPPORTS_PS |
-                IEEE80211_HW_BEACON_FILTER;
+                IEEE80211_HW_BEACON_FILTER |
+                IEEE80211_HW_SUPPORTS_UAPSD;
 
         wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
         wl->hw->wiphy->max_scan_ssids = 1;