summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2025-03-09 07:36:39 +0200
committerJohannes Berg <johannes.berg@intel.com>2025-03-11 16:29:24 +0100
commit834bfc698bf7cee3bf61c0209b410c7f97a54108 (patch)
treec4508682da79cb69c5018086371c22a491110294
parent3ad61970ac9e164be1b09b46c01aa942e8966132 (diff)
wifi: iwlwifi: mld: fix build with CONFIG_PM_SLEEP undefined
fw_status.in_d3 is only defined under CONFIG_PM_SLEEP. Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Link: https://patch.msgid.link/20250309073442.6f7e44a27b87.I78b9311019b59477a1961cddc4640b255ceda651@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mld/hcmd.h4
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mld/mld.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h b/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h
index 773bc1b09392..64a8d4248324 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h
+++ b/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
/*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
*/
#ifndef __iwl_mld_hcmd_h__
#define __iwl_mld_hcmd_h__
@@ -10,8 +10,10 @@ static inline int iwl_mld_send_cmd(struct iwl_mld *mld, struct iwl_host_cmd *cmd
/* No commands, including the d3 related commands, should be sent
* after entering d3
*/
+#ifdef CONFIG_PM_SLEEP
if (WARN_ON(mld->fw_status.in_d3))
return -EIO;
+#endif
if (!(cmd->flags & CMD_ASYNC))
lockdep_assert_wiphy(mld->wiphy);
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mld.h b/drivers/net/wireless/intel/iwlwifi/mld/mld.h
index 6eda6081c8b4..1ab98ba42c76 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/mld.h
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mld.h
@@ -296,7 +296,9 @@ iwl_cleanup_mld(struct iwl_mld *mld)
CLEANUP_STRUCT(mld);
CLEANUP_STRUCT(&mld->scan);
+#ifdef CONFIG_PM_SLEEP
mld->fw_status.in_d3 = false;
+#endif
iwl_mld_low_latency_restart_cleanup(mld);