| From 6e8a3b2da62f917c43bfc68fa987afe9ff9136e2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 30 Sep 2020 10:31:20 +0300 |
| Subject: iwlwifi: mvm: split a print to avoid a WARNING in ROC |
| |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| |
| [ Upstream commit 903b3f9badf1d54f77b468b96706dab679b45b14 ] |
| |
| A print in the remain on channel code was too long and caused |
| a WARNING, split it. |
| |
| Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Fixes: dc28e12f2125 ("iwlwifi: mvm: ROC: Extend the ROC max delay duration & limit ROC duration") |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/iwlwifi.20200930102759.58d57c0bdc68.Ib06008665e7bf1199c360aa92691d9c74fb84990@changeid |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++++++--- |
| 1 file changed, 6 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |
| index b86c7a36d3f17..ec2ecdd1cc4ec 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |
| @@ -3198,9 +3198,12 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm, |
| aux_roc_req.apply_time_max_delay = cpu_to_le32(delay); |
| |
| IWL_DEBUG_TE(mvm, |
| - "ROC: Requesting to remain on channel %u for %ums (requested = %ums, max_delay = %ums, dtim_interval = %ums)\n", |
| - channel->hw_value, req_dur, duration, delay, |
| - dtim_interval); |
| + "ROC: Requesting to remain on channel %u for %ums\n", |
| + channel->hw_value, req_dur); |
| + IWL_DEBUG_TE(mvm, |
| + "\t(requested = %ums, max_delay = %ums, dtim_interval = %ums)\n", |
| + duration, delay, dtim_interval); |
| + |
| /* Set the node address */ |
| memcpy(aux_roc_req.node_addr, vif->addr, ETH_ALEN); |
| |
| -- |
| 2.25.1 |
| |
