Commit 46bf0c9a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-2024-04-23' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 



Johannes berg says:

====================
Fixes for the current cycle:
 * ath11k: convert to correct RCU iteration of IPv6 addresses
 * iwlwifi: link ID, FW API version, scanning and PASN fixes
 * cfg80211: NULL-deref and tracing fixes
 * mac80211: connection mode, mesh fast-TX, multi-link and
             various other small fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6c9cd59d 91112fc6

drivers/net/wireless/ath/ath11k/mac.c

+3 −1
Original line number Diff line number Diff line
@@ -9020,6 +9020,7 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw, 
	offload = &arvif->arp_ns_offload;

	count = 0;



	/* Note: read_lock_bh() calls rcu_read_lock() */

	read_lock_bh(&idev->lock);



	memset(offload->ipv6_addr, 0, sizeof(offload->ipv6_addr));
@@ -9050,7 +9051,8 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw, 
	}



	/* get anycast address */

	for (ifaca6 = idev->ac_list; ifaca6; ifaca6 = ifaca6->aca_next) {

	for (ifaca6 = rcu_dereference(idev->ac_list); ifaca6;

	     ifaca6 = rcu_dereference(ifaca6->aca_next)) {

		if (count >= ATH11K_IPV6_MAX_COUNT)

			goto generate;

drivers/net/wireless/intel/iwlwifi/cfg/bz.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_BZ_UCODE_API_MAX	90

#define IWL_BZ_UCODE_API_MAX	89



/* Lowest firmware API version supported */

#define IWL_BZ_UCODE_API_MIN	80

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	90

#define IWL_SC_UCODE_API_MAX	89



/* Lowest firmware API version supported */

#define IWL_SC_UCODE_API_MIN	82

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ int iwl_mvm_ftm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	if (!pasn)

		return -ENOBUFS;



	iwl_mvm_ftm_remove_pasn_sta(mvm, addr);



	pasn->cipher = iwl_mvm_cipher_to_location_cipher(cipher);



	switch (pasn->cipher) {

drivers/net/wireless/intel/iwlwifi/mvm/link.c

+1 −1
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ int iwl_mvm_unset_link_mapping(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	RCU_INIT_POINTER(mvm->link_id_to_link_conf[link_info->fw_link_id],

			 NULL);

	iwl_mvm_release_fw_link_id(mvm, link_info->fw_link_id);

	return 0;

}
@@ -296,7 +297,6 @@ int iwl_mvm_remove_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		return 0;



	cmd.link_id = cpu_to_le32(link_info->fw_link_id);

	iwl_mvm_release_fw_link_id(mvm, link_info->fw_link_id);

	link_info->fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;

	cmd.spec_link_id = link_conf->link_id;

	cmd.phy_id = cpu_to_le32(FW_CTXT_INVALID);