Commit c73ebc0d authored Jun 25, 2025 by Johannes Berg

Merge tag 'iwlwifi-next-2025-06-25' of...

Merge tag 'iwlwifi-next-2025-06-25' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next



Miri Korenblit says:
====================
iwlwifi-next - iwlwifi features

Mostly cleanups. A few fixes and small features.
====================

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parents 5582cbdf e3ad987e

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -12521,7 +12521,7 @@ M: Miri Korenblit <miriam.rachel.korenblit@intel.com>
		L: linux-wireless@vger.kernel.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
		T: git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git/
		F: drivers/net/wireless/intel/iwlwifi/

		INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER

drivers/net/wireless/intel/iwlwifi/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ config IWLWIFI_OPMODE_MODULAR
		default y if IWLDVM=m
		default y if IWLMVM=m
		default y if IWLMLD=m
		default y if IWLWIFI_KUNIT_TESTS=m

		comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM or IWLMLD"
		depends on IWLDVM=n && IWLMVM=n && IWLMLD=n

drivers/net/wireless/intel/iwlwifi/Makefile

+5 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,11 @@ iwlwifi-objs += iwl-debug.o
		iwlwifi-objs += iwl-nvm-utils.o
		iwlwifi-objs += iwl-utils.o
		iwlwifi-objs += iwl-phy-db.o iwl-nvm-parse.o
		iwlwifi-objs += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
		iwlwifi-objs += pcie/ctxt-info.o pcie/ctxt-info-v2.o
		iwlwifi-objs += pcie/trans-gen2.o pcie/tx-gen2.o

		# Bus
		iwlwifi-objs += pcie/ctxt-info.o pcie/ctxt-info-v2.o pcie/drv.o pcie/utils.o
		iwlwifi-objs += pcie/gen1_2/rx.o pcie/gen1_2/tx.o pcie/gen1_2/trans.o
		iwlwifi-objs += pcie/gen1_2/trans-gen2.o pcie/gen1_2/tx-gen2.o

		CFLAGS_pcie/drv.o += -Wno-override-init

drivers/net/wireless/intel/iwlwifi/cfg/bz.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#define IWL_BZ_UCODE_API_MAX 99

		/* Lowest firmware API version supported */
		#define IWL_BZ_UCODE_API_MIN 93
		#define IWL_BZ_UCODE_API_MIN 94

		/* Memory offsets and lengths */
		#define IWL_BZ_SMEM_OFFSET 0x400000

drivers/net/wireless/intel/iwlwifi/cfg/dr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		#define IWL_DR_UCODE_API_MAX 99

		/* Lowest firmware API version supported */
		#define IWL_DR_UCODE_API_MIN 97
		#define IWL_DR_UCODE_API_MIN 98

		/* Memory offsets and lengths */
		#define IWL_DR_SMEM_OFFSET 0x400000