]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: mld: disable queue hang detection for NAN data
authorJohannes Berg <johannes.berg@intel.com>
Sun, 10 May 2026 20:48:28 +0000 (23:48 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 26 May 2026 12:17:09 +0000 (15:17 +0300)
Since peers on NAN data might just use ULW and/or break the
schedule, disable queue hang detection for them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20260510234534.9886987db700.Ifd879478bc30af25de0eada6143dbc3e6a548068@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
drivers/net/wireless/intel/iwlwifi/mld/tx.c

index 546d09a38dab490ac64aa47bd6e90cf6e0afd963..7903ce2b0bebdb818268516f61272db36a1ed25b 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2024 - 2025 Intel Corporation
+ * Copyright (C) 2024 - 2026 Intel Corporation
  */
 #include <net/ip.h>
 
@@ -71,14 +71,19 @@ static int iwl_mld_allocate_txq(struct iwl_mld *mld, struct ieee80211_txq *txq)
 {
        u8 tid = txq->tid == IEEE80211_NUM_TIDS ? IWL_MGMT_TID : txq->tid;
        u32 fw_sta_mask = iwl_mld_fw_sta_id_mask(mld, txq->sta);
-       /* We can't know when the station is asleep or awake, so we
-        * must disable the queue hang detection.
-        */
-       unsigned int watchdog_timeout = txq->vif->type == NL80211_IFTYPE_AP ?
-                               IWL_WATCHDOG_DISABLED :
-                               mld->trans->mac_cfg->base->wd_timeout;
+       unsigned int watchdog_timeout;
        int queue, size;
 
+       switch (txq->vif->type) {
+       case NL80211_IFTYPE_AP:         /* STA might go to PS */
+       case NL80211_IFTYPE_NAN_DATA:   /* peer might ULW/break schedule */
+               watchdog_timeout = IWL_WATCHDOG_DISABLED;
+               break;
+       default:
+               watchdog_timeout = mld->trans->mac_cfg->base->wd_timeout;
+               break;
+       }
+
        lockdep_assert_wiphy(mld->wiphy);
 
        if (tid == IWL_MGMT_TID)