diff options
| author |   Avraham Stern <avraham.stern@intel.com> | 2023-04-18 12:28:14 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2023-04-20 11:45:55 +0200 |
| commit | 22b68fc6d693e7a2b1c0eb852463f4a72522fa08 (patch) | |
| tree | 11dcf5a84ca596793fda0e5f77b2b51ce0de96bd /drivers/net/wireless/intel/iwlwifi/mvm/ops.c | |
| parent | wifi: iwlwifi: mei: re-ask for ownership after it was taken by CSME (diff) | |
| download | wireguard-linux-22b68fc6d693e7a2b1c0eb852463f4a72522fa08.tar.xz wireguard-linux-22b68fc6d693e7a2b1c0eb852463f4a72522fa08.zip | |
wifi: iwlwifi: mvm: fix RFKILL report when driver is going down
When CSME takes ownership, the driver sets RFKILL on, and this
triggers driver unload and sending the confirmation SAP message.
However, when IWL_MVM_MEI_REPORT_RFKILL is set, RFKILL was not
reported and as a result, the driver did not confirm the ownership
transition. Fix it.
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230418122405.29ac3cd3df73.I96b32bc274bfe1e3871e54d3fa29c7ac4f40446f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 26c3f00d6f7d..32625bfacaae 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -1020,10 +1020,14 @@ static void iwl_mvm_me_conn_status(void *priv, const struct iwl_mei_conn_info *c kfree_rcu(prev_conn_info, rcu_head); } -static void iwl_mvm_mei_rfkill(void *priv, bool blocked) +static void iwl_mvm_mei_rfkill(void *priv, bool blocked, + bool csme_taking_ownership) { struct iwl_mvm *mvm = priv; + if (blocked && !csme_taking_ownership) + return; + mvm->mei_rfkill_blocked = blocked; if (!mvm->hw_registered) return; |