Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1668431pxy; Mon, 2 Aug 2021 07:29:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWpEZv84h5sKmMonSr2KnNIXjum36FDP539cteMb77XJDjMKMJPxKPlRJXWr6zQQCV2WbH X-Received: by 2002:a05:6402:1603:: with SMTP id f3mr19501485edv.274.1627914542035; Mon, 02 Aug 2021 07:29:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627914542; cv=none; d=google.com; s=arc-20160816; b=FnbbQu0pXG+sEZmWBAVgENGVCcI5e7ssD+uljo+us0xL5nfFjBbdAKxrkynibMYMI3 9GMvF1O7MPmGrZpZ6fG0SNNPZacf5p+nSrAN0SkBwZlK+98lKjSdVwvz5olvzC5IHPaS 9EKW4otIEzkMJNvphfqto1awptZ1NIkkLYeRMrtF2vCEg7J7KsQHaEVI44dgg7uFnApl hf/SgWz7EGyDTM2fwvXydB2PylUy5l4qOteRrSdtlcjgYzNDbq3eV8ZoN0gd9yboTUOK 5O/Gy1Rk2Hbm1srlkWHk8WGXlpxEVkNqf7FqZ0Y+nTXOMrSoxSdGXXVl5rPORNDQpBUu uUtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=6A2xdjoQN8H43E/AXBUKOKtt9Y9H8iHJ4qwd4uC98KU=; b=rV036wlFzRnOXzNM3C0hk5BCHx/TyTL/67gHz0LG6X8wE6oAUi1eSZ2Dpff1uqCcpd FlzrtP7S37gzCpEasVCCxVG74EiBzzuQ7P9w81q/yuNIG9/pJ2cHPlH53j5ZJ07OhIYz 0sUxx2lRBWwa+uSwf+N7315EZaVDU73Cv5KPfJSm0/Db4AtHJW55rBUKjtUd8JE1Xz6K ME41GeMAsMt3KVF/aXsNEZTBOIaSvdL3DDMkqMC1JqplCtabCgwRZa6u/QM5TayDOSjs RESvTVH3UEe2OK/BNWb/RsEznKwuFJB9WJ6keENIK7wjXeWN0uopWeKIeFJYhUrz58an EsVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si10022061edr.112.2021.08.02.07.28.39; Mon, 02 Aug 2021 07:29:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234051AbhHBO2o (ORCPT + 99 others); Mon, 2 Aug 2021 10:28:44 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:50906 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233959AbhHBO2n (ORCPT ); Mon, 2 Aug 2021 10:28:43 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1mAYvf-001xts-4d; Mon, 02 Aug 2021 17:28:32 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Mon, 2 Aug 2021 17:28:18 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802142829.109448-1-luca@coelho.fi> References: <20210802142829.109448-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH 01/12] iwlwifi: mvm: remove trigger EAPOL time event Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mordechay Goodstein 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 Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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, -- 2.32.0