1 files changed, 4 insertions, 1 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 5f9a8d7af83d..8f68bf9746d0 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1087,7 +1087,10 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
                 info->flags |= IEEE80211_TX_CTL_NO_ACK;
         } else {
                 tx->flags |= IEEE80211_TX_UNICAST;
-                info->flags &= ~IEEE80211_TX_CTL_NO_ACK;
+                if (unlikely(local->wifi_wme_noack_test))
+                        info->flags |= IEEE80211_TX_CTL_NO_ACK;
+                else
+                        info->flags &= ~IEEE80211_TX_CTL_NO_ACK;
         }
 
         if (tx->flags & IEEE80211_TX_FRAGMENTED) {