1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 5f0701c992a4..ec91dd90acfd 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -2844,7 +2844,8 @@ static int iwl_mvm_mac_conf_tx(struct ieee80211_hw *hw,
 }
 
 static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
-                                      struct ieee80211_vif *vif)
+                                       struct ieee80211_vif *vif,
+                                       u16 req_duration)
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;
@@ -2857,6 +2858,9 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
         if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PREPARE_TX))
                 return;
 
+        if (req_duration > duration)
+                duration = req_duration;
+
         mutex_lock(&mvm->mutex);
         /* Try really hard to protect the session and hear a beacon */
         iwl_mvm_protect_session(mvm, vif, duration, min_duration, 500, false);