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 B407E19E827; Tue, 16 Jul 2024 14:26:45 +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=1721140005; cv=none; b=gVYKGxY7BFqpkEwXtIr+TqyBSo1zXOUu01WwM3K/hOhNp4pl4Ji7CYioyViQ5xGpWSz6SbwTYTU7o7aSx3Z1gSxZ8DJsTV6E2fbSSTRdVXDevqohpmGoBpCVv1TkfIIGl+g5jsCW2ho8/NfVw2qro8qSDFuy8odok+oJdTlnAho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721140005; c=relaxed/simple; bh=vgR+WnEIyInGRZTT391ah5DJ77CZ92bMxyRFab4ePP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bblbuTC9qV7PD4Fc0C88IrRhz+D6ui8MO551gUBk/iNBztvao3KXvg2euoxmyl7CxRmJAZY1Pchm4ghbsb2YY3BpgZNhKaHsQOm+smG8mh9QT6HDhKtv33cqqittlnog31fMVoIoEhpBrm3oC50khIjSACpIEor7mHFkpbpc34I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C3Ucw+J4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C3Ucw+J4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02A0AC4AF09; Tue, 16 Jul 2024 14:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721140005; bh=vgR+WnEIyInGRZTT391ah5DJ77CZ92bMxyRFab4ePP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C3Ucw+J4Dxab8Nj92MdiFywrIbD4tePpRsVQBTGcaY1DeP3h8DViNcLN/aLJd70wc Ud+FxOrxiUDP2r8xno+z8nhEiosbwumoSpFmOQNB45sksLscoLnJabAskS3b5pQAtb JCpwDQVR5cDWc6IYvYhnwCDUMr21D4QcPuTlwdEYLKLXKj+qhGBJEno957/KNgv2Eq rQXQleDdg6oe8fFoP+aGYONNk05pHWiQb5fl4x9nms3wUrSS7eNUJ8U80hlOpE080+ IfhEW7g9YY5ywNGQJXytH7RKW6mbMrSayWf4t2lci5SoxkJc5rN5cY0FVnQ8YEYcC2 CPQqiGQ3P4cLA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Gabay , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, gregory.greenman@intel.com, emmanuel.grumbach@intel.com, ilan.peer@intel.com, shaul.triebitz@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 20/22] wifi: iwlwifi: properly set WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK Date: Tue, 16 Jul 2024 10:24:27 -0400 Message-ID: <20240716142519.2712487-20-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716142519.2712487-1-sashal@kernel.org> References: <20240716142519.2712487-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.9 Content-Transfer-Encoding: 8bit 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 5f6b16d3fc8a3..853da607549a7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -651,7 +651,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