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 391FB157A4F; Tue, 23 Jul 2024 18:29:22 +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=1721759362; cv=none; b=CsMoHZdYqiW2HigJ5ih36Uj4cgKEkHp/TXXxJyGqK2bXfNO071Z3Pa7LNAr+aIAdKaIYdDNaf2jDFq+9MoyKz+hwsRQc5WIU6gUrXx9kZtxZGVMZH+5gLY9UZTGbxyQX7/7SLvSfGl07VOxqqDNrWWw5skCzRl7p/SFsakjEF1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759362; c=relaxed/simple; bh=RuUXvkiMCyA1NRMqrSShzuEKKIi+IMptsz5Mci1WAXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fsh8nN/V9mWphlrz1nBnDlnlxRHwj14xr0OzO/ADUzpQoTza7yZsx2CiBYYRrr5ef4v5vmJ16zml+b6tLWtqdaxDuQYqybzqLsdhesn1fF83aZBNP6UsLhgSkvhOjpF0ALfIro+2W722lJ7mTZOLILfAYh6D0+wtv/nE7HVMYNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XNmBJtnm; 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="XNmBJtnm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACB45C4AF0B; Tue, 23 Jul 2024 18:29:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759362; bh=RuUXvkiMCyA1NRMqrSShzuEKKIi+IMptsz5Mci1WAXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XNmBJtnmaY7vwusJlwCMRBfjfdAO6EY8MVgCDAbf9CIe3Zh6Fu+RXLzRRuDCQHY8p TpgmU4wQw00MNOzdOIJf9LNrlvtbnncEle3q1dzXLD4jh4909ltZdYtejy/Q0GuOUw y8RzEMnTp1c5Y/5kwfjIAiGKm/aUT6Hl5VWdnqqU= 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.1 089/105] wifi: iwlwifi: properly set WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK Date: Tue, 23 Jul 2024 20:24:06 +0200 Message-ID: <20240723180406.673891567@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180402.490567226@linuxfoundation.org> References: <20240723180402.490567226@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.1-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 801098c5183b6..4e8bdd3d701bf 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -532,7 +532,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