| From 375477aa68df1bac2c1d5886886c5b1114fd786b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 31 May 2023 19:50:06 +0300 |
| Subject: wifi: iwlwifi: mvm: send time sync only if needed |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit ead65aa2d5155728baec90f6404cd02618ef29d0 ] |
| |
| If there's no peer configured then there's no point in sending |
| the command down to the firmware with an invalid peer address. |
| |
| Fixes: cf85123a210f ("wifi: iwlwifi: mvm: support enabling and disabling HW timestamping") |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> |
| Link: https://lore.kernel.org/r/20230531194630.0fb9f81f1852.Idcc41b67d1fbb421e5ed9bac2177b948b7b4d1c9@changeid |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| index 205c09bc98634..a6367909d7fe4 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| @@ -1699,9 +1699,11 @@ int iwl_mvm_up(struct iwl_mvm *mvm) |
| |
| if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) { |
| iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_UPDATE_DB); |
| - iwl_mvm_time_sync_config(mvm, mvm->time_sync.peer_addr, |
| - IWL_TIME_SYNC_PROTOCOL_TM | |
| - IWL_TIME_SYNC_PROTOCOL_FTM); |
| + |
| + if (mvm->time_sync.active) |
| + iwl_mvm_time_sync_config(mvm, mvm->time_sync.peer_addr, |
| + IWL_TIME_SYNC_PROTOCOL_TM | |
| + IWL_TIME_SYNC_PROTOCOL_FTM); |
| } |
| |
| if (!mvm->ptp_data.ptp_clock) |
| -- |
| 2.39.2 |
| |
