iwlwifi: mvm: remove trigger EAPOL time event

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>
Link: https://lore.kernel.org/r/iwlwifi.20210802172232.2ff350d85eab.I02c5b5d29c0d5c2e014bd1081b07ed33772ae04d@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 70ebecb73c24422dd4839c2d6a34481ca70fe3b6..3a7f756c4545f19a274f4d75e16237754c3e7d9c 100644 (file)
--- 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,