From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F45915887F; Tue, 23 Jul 2024 18:35:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759724; cv=none; b=byZKwVb1vP5N1WccHEZ8mNLH/un1TBU8Tkx1uJpcvMc7HzL13KLaHPZIRoGa46lEBqdfqncmS42tNU6m6qLmay6vATlFepjjMpIcmQi7OjRh/LXyxDNZ3Yq/E4pL6ewAA/G6i1MDGDBibLupYEiIByzKbBL8vOGvU76tzww2m8M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759724; c=relaxed/simple; bh=/K9urH5O2G+uikkcUXfBSpPi7X75JwH5gBsezKkpKIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XukhRoST8LBr5WzKOF+HoCUDFuFresa3BCvvYIHnvuIucHNhjX42KblONyfw9xKimsFSkxT2iJoDTj5bN8fSUj+FKaj7HxnhueXnbUjnDyvCMS77lb88D6145d/hySyKiKe6NokJQcHvQvJfj3TEZL02b+fXW+8KNyAKkiyskC8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S8ShobKH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S8ShobKH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBD24C4AF0A; Tue, 23 Jul 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759724; bh=/K9urH5O2G+uikkcUXfBSpPi7X75JwH5gBsezKkpKIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8ShobKHK+RYVQBejgmNCC5e5X6CoZqP2pslAjKp4rmmh7aV1ELTK5vd6ErP7krBd OqjV2DBzuflFi32gFqCn+rEneVNd8OySGh0c220G3JW0ipDD7o0t5Ax8XrCFBKe34o onGkUO2VjjntCqiJP71wTQn3+ifKF8uZ5lgyqiVg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Gabay , Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.6 107/129] wifi: iwlwifi: properly set WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK Date: Tue, 23 Jul 2024 20:24:15 +0200 Message-ID: <20240723180408.926142603@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Gabay [ Upstream commit 4ec17ce716bdaf680288ce680b4621b52483cc96 ] The WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK should be set based on the WOWLAN_KEK_KCK_MATERIAL command version. Currently, the command version in the firmware has advanced to 4, which prevents the flag from being set correctly, fix that. Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20240703064026.a0f162108575.If1a9785727d2a1b0197a396680965df1b53d4096@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 37f628a9b8115..7d0032a51f2d3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -600,7 +600,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) hw->wiphy->features |= NL80211_FEATURE_WFA_TPC_IE_IN_PROBES; if (iwl_fw_lookup_cmd_ver(mvm->fw, WOWLAN_KEK_KCK_MATERIAL, - IWL_FW_CMD_VER_UNKNOWN) == 3) + IWL_FW_CMD_VER_UNKNOWN) >= 3) hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK; if (fw_has_api(&mvm->fw->ucode_capa, -- 2.43.0