2024-03-29 22:41:08

by Bjoern A. Zeeb

[permalink] [raw]
Subject: [PATCH 3/3] wifi: iwlwifi: mvm: check for CONFIG_IWLMEI to be enabled for more code

Some of the code is only needed in case MEI support is available
but given it is a GPL-only feature this may lead to unused and/or
unresolved symbols on platforms sharing the otherwise dual-licensed
driver code or in case CONFIG_IWLMEI is turned off.

Signed-off-by: Bjoern A. Zeeb <[email protected]>
Sponsored by: The FreeBSD Foundation
Link: https://cgit.freebsd.org/src/commit/sys/contrib/dev/iwlwifi/mvm/ops.c?id=75c779fb279c2bea90c08e275af5937213bdca81
---
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git drivers/net/wireless/intel/iwlwifi/mvm/ops.c drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index adbbe19aeae5..2514319bce2a 100644
--- drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1029,6 +1029,7 @@ static const struct iwl_dump_sanitize_ops iwl_mvm_sanitize_ops = {
.frob_mem = iwl_mvm_frob_mem,
};

+#if IS_ENABLED(CONFIG_IWLMEI)
static void iwl_mvm_me_conn_status(void *priv, const struct iwl_mei_conn_info *conn_info)
{
struct iwl_mvm *mvm = priv;
@@ -1078,6 +1079,7 @@ static void iwl_mvm_mei_roaming_forbidden(void *priv, bool forbidden)

iwl_mvm_send_roaming_forbidden_event(mvm, mvm->csme_vif, forbidden);
}
+#endif

static void iwl_mvm_sap_connected_wk(struct work_struct *wk)
{
@@ -1111,6 +1113,7 @@ static void iwl_mvm_sap_connected_wk(struct work_struct *wk)
ieee80211_free_hw(mvm->hw);
}

+#if IS_ENABLED(CONFIG_IWLMEI)
static void iwl_mvm_mei_sap_connected(void *priv)
{
struct iwl_mvm *mvm = priv;
@@ -1135,6 +1138,7 @@ static const struct iwl_mei_ops mei_ops = {
.sap_connected = iwl_mvm_mei_sap_connected,
.nic_stolen = iwl_mvm_mei_nic_stolen,
};
+#endif

static struct iwl_op_mode *
iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
--
2.40.0