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 0615083A14; Sun, 24 Mar 2024 22:50:33 +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=1711320633; cv=none; b=grberrzKoTw5cNsVYhxgstXHR0D0lGBbT5Ab/yW1lhnHi/6Pu6Lfx8bcSFNfPuwQOGeP6Bu7wE0blV0UDm4i8+Qf4grLNFtnl0p6Euv/8YheNFKxG5V+E1Wt9NIxvDYIZBHMeMNn0tSVEhjqbx7MCWHzkRKyyzePkY8l2/6T8/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320633; c=relaxed/simple; bh=afXxZDuytKdo2b9kX8f74F3OLY83odqcQkTH0+MIdeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HE4Yh1VdTeK64StQ4EbN/y8t0f7/lueZyHR9c0kvu0HM7huIQRykRLYbeaJkbWxcT14cpXSngS9uty+lUC/9lNUGUbsyPmTwELZ1emnFs2WLohjctxQaWtI4hIzmnG29pilCKpBmJqAPCMnE04JmAmS1+3jAX3wF411fwcxZCEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rcCzmNJe; 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="rcCzmNJe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AE6FC43390; Sun, 24 Mar 2024 22:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320632; bh=afXxZDuytKdo2b9kX8f74F3OLY83odqcQkTH0+MIdeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcCzmNJeQSqGrXmOqica05m8Nr6S6aHWIC/G+oEXhRuQ56jD0aHiV55aa3XvkJLqC LzR8yj8XTpPS2b9GOAvK6nb5SdMuscjHuHgzUqwXWIczxVfxFHMuUBflzYJBlmoobt QetNKUu6maSnTOm9L75qORiVwFAlup3+uBz6XoSCbJmh/q/hdUkTMhPUhKrdjumaPU m40mOuTkeuHvEKsOcfQ2ExQffkaMSw2JSngfFz/NUiBjARxOq/o8Z1ZyxtABFOnENz aIlJD9/Ih30D2CdB1YGazU8yZ2J3SXYGdKUdbWNTnMY4fqrgAiKyoxWH7Eb/UcMGQY 6dtfP1OTWcO9A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Mukesh Sisodiya , Gregory Greenman , Miri Korenblit , Sasha Levin Subject: [PATCH 6.7 194/713] wifi: iwlwifi: always have 'uats_enabled' Date: Sun, 24 Mar 2024 18:38:40 -0400 Message-ID: <20240324224720.1345309-195-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-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 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit f639602a58e7564dd091c7c0793f61042bad9bb6 ] We check this in code that'd be complicated to put under ifdef (CONFIG_ACPI), so just always have 'uats_enabled'. Fixes: 4a9bb5b4d949 ("wifi: iwlwifi: fw: Add support for UATS table in UHB") Signed-off-by: Johannes Berg Reviewed-by: Mukesh Sisodiya Reviewed-by: Gregory Greenman Signed-off-by: Miri Korenblit Link: https://msgid.link/20240129211905.bdc5fb20f00a.I902d801d79873c5c9cd51cef8e8226e2acefe88d@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h index 357727774db90..baabb8e321f8d 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h @@ -173,9 +173,9 @@ struct iwl_fw_runtime { struct iwl_sar_offset_mapping_cmd sgom_table; bool sgom_enabled; u8 reduced_power_flags; - bool uats_enabled; struct iwl_uats_table_cmd uats_table; #endif + bool uats_enabled; }; void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, -- 2.43.0