Commit dcbc94c1 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-next-2025-10-28' of... 

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

Miri Korenblit says:
====================
iwlwifi features. Notably:

- Unsupported APIs cleanup
- New sniffer API
- small bugfixes and features
====================

Link: https://patch.msgid.link/DM3PPF63A6024A9B77EE7385B4C865E3E54A3FDA@DM3PPF63A6024A9.namprd11.prod.outlook.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 1a2352ad 3df28496

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

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_22000_base = { 
	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.apmg_not_supported = true,

	.mac_addr_from_csr = 0x380,

	.min_umac_error_event_table = 0x400000,

	.d3_debug_data_base_addr = 0x401000,

	.d3_debug_data_length = 60 * 1024,

	.mon_smem_regs = {

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

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static const struct iwl_family_base_params iwl8000_base = { 
	.smem_offset = IWL8260_SMEM_OFFSET,

	.smem_len = IWL8260_SMEM_LEN,

	.apmg_not_supported = true,

	.min_umac_error_event_table = 0x800000,

};



static const struct iwl_tt_params iwl8000_tt_params = {

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

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl9000_base = { 
	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.apmg_not_supported = true,

	.mac_addr_from_csr = 0x380,

	.min_umac_error_event_table = 0x800000,

	.d3_debug_data_base_addr = 0x401000,

	.d3_debug_data_length = 92 * 1024,

	.nvm_hw_section_num = 10,

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static const struct iwl_family_base_params iwl_ax210_base = { 
	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.apmg_not_supported = true,

	.mac_addr_from_csr = 0x380,

	.min_umac_error_event_table = 0x400000,

	.d3_debug_data_base_addr = 0x401000,

	.d3_debug_data_length = 60 * 1024,

	.mon_smem_regs = {

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "fw/api/txq.h"



/* Highest firmware core release supported */

#define IWL_BZ_UCODE_CORE_MAX	99

#define IWL_BZ_UCODE_CORE_MAX	101



/* Lowest firmware API version supported */

#define IWL_BZ_UCODE_API_MIN	100
@@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_bz_base = { 
	.smem_len = IWL_BZ_SMEM_LEN,

	.apmg_not_supported = true,

	.mac_addr_from_csr = 0x30,

	.min_umac_error_event_table = 0xD0000,

	.d3_debug_data_base_addr = 0x401000,

	.d3_debug_data_length = 60 * 1024,

	.mon_smem_regs = {
@@ -90,6 +89,7 @@ const struct iwl_mac_cfg iwl_bz_mac_cfg = { 
	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};

EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_bz_mac_cfg);



const struct iwl_mac_cfg iwl_gl_mac_cfg = {

	.device_family = IWL_DEVICE_FAMILY_BZ,