diff mbox series

[01/12] iwlwifi: mvm: remove trigger EAPOL time event

Message ID iwlwifi.20210802172232.2ff350d85eab.I02c5b5d29c0d5c2e014bd1081b07ed33772ae04d@changeid (mailing list archive)
State Accepted
Commit 1a81bddf7f47443240b7703bf9e5ffb12c4261cf
Delegated to: Luca Coelho
Headers show
Series iwlwifi: updates intended for v5.15 2021-08-02 part 2 | expand

Commit Message

Luca Coelho Aug. 2, 2021, 2:28 p.m. UTC 
From: Mordechay Goodstein <mordechay.goodstein@intel.com>

EAPOL failure results in deauthentication with various reasons, not
related to AUTH failure specifically, so we just merge AUTH failure
with failed to assoc to AP.

Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Comments

Luca Coelho Aug. 26, 2021, 8:33 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Mordechay Goodstein <mordechay.goodstein@intel.com>
> 
> EAPOL failure results in deauthentication with various reasons, not
> related to AUTH failure specifically, so we just merge AUTH failure
> with failed to assoc to AP.
> 
> Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

12 patches applied to iwlwifi-next.git, thanks.

1a81bddf7f47 iwlwifi: mvm: remove trigger EAPOL time event
a6dfbd040e26 iwlwifi: mvm: set replay counter on key install
de34d1c1d30d iwlwifi: mvm: restrict FW SMPS request
02289645a085 iwlwifi: pcie: remove spaces from queue names
c1868c0b7889 iwlwifi: mvm: remove check for vif in iwl_mvm_vif_from_mac80211()
cd7ae5493448 iwlwifi: mvm: fix old-style static const declaration
0f5d44ac6e55 iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed
2b06127df02f iwlwifi: remove trailing semicolon in macro definition
5993c90ccb56 iwlwifi: use DEFINE_MUTEX() for mutex lock
c6ce1c74ef29 iwlwifi: mvm: avoid static queue number aliasing
366fc672d625 iwlwifi: mvm: clean up number of HW queues
105167830d5f iwlwifi: mvm: treat MMPDUs in iwl_mvm_mac_tx() as bcast
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 70ebecb73c24..3a7f756c4545 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -5035,22 +5035,14 @@  static void iwl_mvm_event_mlme_callback_ini(struct iwl_mvm *mvm,
 					    struct ieee80211_vif *vif,
 					    const  struct ieee80211_mlme_event *mlme)
 {
-	if (mlme->data == ASSOC_EVENT && (mlme->status == MLME_DENIED ||
-					  mlme->status == MLME_TIMEOUT)) {
+	if ((mlme->data == ASSOC_EVENT || mlme->data == AUTH_EVENT) &&
+	    (mlme->status == MLME_DENIED || mlme->status == MLME_TIMEOUT)) {
 		iwl_dbg_tlv_time_point(&mvm->fwrt,
 				       IWL_FW_INI_TIME_POINT_ASSOC_FAILED,
 				       NULL);
 		return;
 	}
 
-	if (mlme->data == AUTH_EVENT && (mlme->status == MLME_DENIED ||
-					 mlme->status == MLME_TIMEOUT)) {
-		iwl_dbg_tlv_time_point(&mvm->fwrt,
-				       IWL_FW_INI_TIME_POINT_EAPOL_FAILED,
-				       NULL);
-		return;
-	}
-
 	if (mlme->data == DEAUTH_RX_EVENT || mlme->data == DEAUTH_TX_EVENT) {
 		iwl_dbg_tlv_time_point(&mvm->fwrt,
 				       IWL_FW_INI_TIME_POINT_DEASSOC,