From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
Andrei Otcheretianski <andrei.otcheretianski@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 1/8] iwlwifi: mvm: Don't sleep in RX path
Date: Tue, 23 Apr 2019 11:50:07 +0300 [thread overview]
Message-ID: <20190423085014.15390-2-luca@coelho.fi> (raw)
In-Reply-To: <20190423085014.15390-1-luca@coelho.fi>
From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Don't use cancel_delayed_work_sync() inside the channel switch
notifications as they are handled synchronously as part of the RX path.
Fix that by replacing it with cancel_delayed_work(). This should be safe
as we don't really care whether the work is already started and in such
case we would disconnect anyway.
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index fcec25b7b679..53c217af13c8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1570,7 +1570,7 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,
return;
case NL80211_IFTYPE_STATION:
iwl_mvm_csa_client_absent(mvm, vif);
- cancel_delayed_work_sync(&mvmvif->csa_work);
+ cancel_delayed_work(&mvmvif->csa_work);
ieee80211_chswitch_done(vif, true);
break;
default:
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
index 50314018d157..4d34e5ab1bff 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
@@ -234,7 +234,7 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,
break;
}
iwl_mvm_csa_client_absent(mvm, te_data->vif);
- cancel_delayed_work_sync(&mvmvif->csa_work);
+ cancel_delayed_work(&mvmvif->csa_work);
ieee80211_chswitch_done(te_data->vif, true);
break;
default:
--
2.20.1
next prev parent reply other threads:[~2019-04-23 8:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 8:50 [PATCH 0/8] iwlwifi: updates intended for v5.2 2019-04-23 Luca Coelho
2019-04-23 8:50 ` Luca Coelho [this message]
2019-04-23 8:50 ` [PATCH 2/8] iwlwifi: pcie: remove stray character in iwl_pcie_rx_alloc_page() Luca Coelho
2019-04-23 8:50 ` [PATCH 3/8] iwlwifi: parse command version TLV Luca Coelho
2019-04-23 8:50 ` [PATCH 4/8] iwlwifi: dbg_ini: add lmac and umac error tables dumping support Luca Coelho
2019-04-23 8:50 ` [PATCH 5/8] iwlwifi: dbg_ini: add periodic trigger support Luca Coelho
2019-04-23 8:50 ` [PATCH 6/8] iwlwifi: dbg: replace dump info device family with HW type Luca Coelho
2019-04-23 8:50 ` [PATCH 7/8] iwlwifi: avoid allocating memory for region with disabled domain Luca Coelho
2019-04-23 8:50 ` [PATCH 8/8] iwlwifi: dbg_ini: check for valid region type during regions parsing Luca Coelho
2019-04-23 8:53 ` [PATCH 0/8] iwlwifi: updates intended for v5.2 2019-04-23 Luciano Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190423085014.15390-2-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=andrei.otcheretianski@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox