Commit 809f6833 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2025-07-10' of... 

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

Johannes Berg says:

====================
Quite a bit more work, notably:
 - mt76: firmware recovery improvements, MLO work
 - iwlwifi: use embedded PNVM in (to be released) FW images
            to fix compatibility issues
 - cfg80211/mac80211: extended regulatory info support (6 GHz)
 - cfg80211: use "faux device" for regulatory

* tag 'wireless-next-2025-07-10' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (48 commits)
  wifi: mac80211: don't complete management TX on SAE commit
  wifi: cfg80211/mac80211: implement dot11ExtendedRegInfoSupport
  wifi: mac80211: send extended MLD capa/ops if AP has it
  wifi: mac80211: copy first_part into HW scan
  wifi: cfg80211: add a flag for the first part of a scan
  wifi: mac80211: remove DISALLOW_PUNCTURING_5GHZ code
  wifi: cfg80211: only verify part of Extended MLD Capabilities
  wifi: nl80211: make nl80211_check_scan_flags() type safe
  wifi: cfg80211: hide scan internals
  wifi: mac80211: fix deactivated link CSA
  wifi: mac80211: add mandatory bitrate support for 6 GHz
  wifi: mac80211: remove spurious blank line
  wifi: mac80211: verify state before connection
  wifi: mac80211: avoid weird state in error path
  wifi: iwlwifi: mvm: remove support for iwl_wowlan_info_notif_v4
  wifi: iwlwifi: bump minimum API version in BZ
  wifi: iwlwifi: mvm: remove unneeded argument
  wifi: iwlwifi: mvm: remove MLO GTK rekey code
  wifi: iwlwifi: pcie: rename iwl_pci_gen1_2_probe() argument
  wifi: iwlwifi: match discrete/integrated to fix some names
  ...
====================

Link: https://patch.msgid.link/20250710123113.24878-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 96698d18 6b04716c

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

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



/* Highest firmware API version supported */

#define IWL_BZ_UCODE_API_MAX	99

#define IWL_BZ_UCODE_API_MAX	102



/* Lowest firmware API version supported */

#define IWL_BZ_UCODE_API_MIN	94

#define IWL_BZ_UCODE_API_MIN	98



/* 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
@@ -9,7 +9,7 @@ 
#include "fw/api/txq.h"



/* Highest firmware API version supported */

#define IWL_DR_UCODE_API_MAX	99

#define IWL_DR_UCODE_API_MAX	102



/* Lowest firmware API version supported */

#define IWL_DR_UCODE_API_MIN	98

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

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



/* Highest firmware API version supported */

#define IWL_SC_UCODE_API_MAX	99

#define IWL_SC_UCODE_API_MAX	102



/* Lowest firmware API version supported */

#define IWL_SC_UCODE_API_MIN	98

drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c

+9 −12
Original line number Diff line number Diff line
@@ -676,8 +676,7 @@ static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans) 
			    CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM);



		/* See if we got it */

		ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM,

		ret = iwl_poll_bits(trans, CSR_HW_IF_CONFIG_REG,

				    CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM,

				    IWL_EEPROM_SEM_TIMEOUT);

		if (ret >= 0) {
@@ -797,8 +796,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr, 


	iwl_write32(trans, CSR_EEPROM_REG,

		    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));

	ret = iwl_poll_bit(trans, CSR_EEPROM_REG,

				 CSR_EEPROM_REG_READ_VALID_MSK,

	ret = iwl_poll_bits(trans, CSR_EEPROM_REG,

			    CSR_EEPROM_REG_READ_VALID_MSK,

			    IWL_EEPROM_ACCESS_TIMEOUT);

	if (ret < 0) {
@@ -993,8 +991,7 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size) 
			iwl_write32(trans, CSR_EEPROM_REG,

				    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));



			ret = iwl_poll_bit(trans, CSR_EEPROM_REG,

					   CSR_EEPROM_REG_READ_VALID_MSK,

			ret = iwl_poll_bits(trans, CSR_EEPROM_REG,

					    CSR_EEPROM_REG_READ_VALID_MSK,

					    IWL_EEPROM_ACCESS_TIMEOUT);

			if (ret < 0) {

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	/********************

	 * 6. Setup services

	 ********************/

	if (iwl_setup_deferred_work(priv))

	err = iwl_setup_deferred_work(priv);

	if (err)

		goto out_uninit_drv;



	iwl_setup_rx_handlers(priv);