Commit b6075c80 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Kalle Valo says:

====================
wireless fixes for v6.13-rc5

Few minor fixes this time, nothing special.

* tag 'wireless-2024-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: cw1200: Fix potential NULL dereference
  wifi: iwlwifi: mvm: Fix __counted_by usage in cfg80211_wowlan_nd_*
  MAINTAINERS: wifi: ath: add Jeff Johnson as maintainer
  wifi: iwlwifi: fix CRF name for Bz
====================

Link: https://patch.msgid.link/20241219185042.662B6C4CECE@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c0cc1268 146b6057

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3608,6 +3608,7 @@ F: drivers/phy/qualcomm/phy-ath79-usb.c 








ATHEROS ATH GENERIC UTILITIES









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <jjohnson@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/net/wireless/ath/*
































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



+1
−0






























Original line number
Diff line number
Diff line







@@ -161,6 +161,7 @@ const struct iwl_cfg_trans_params iwl_gl_trans_cfg = {

















const char iwl_bz_name[] = "Intel(R) TBD Bz device";









const char iwl_fm_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz";









const char iwl_wh_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz";









const char iwl_gl_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz";









const char iwl_mtp_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz";










































drivers/net/wireless/intel/iwlwifi/iwl-config.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -545,6 +545,7 @@ extern const char iwl_ax231_name[];







extern const char iwl_ax411_name[];









extern const char iwl_bz_name[];









extern const char iwl_fm_name[];









extern const char iwl_wh_name[];









extern const char iwl_gl_name[];









extern const char iwl_mtp_name[];









extern const char iwl_sc_name[];
































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



+11
−3






























Original line number
Diff line number
Diff line







@@ -2954,6 +2954,7 @@ static void iwl_mvm_query_set_freqs(struct iwl_mvm *mvm,







				    int idx)









{









	int i;









	int n_channels = 0;



















	if (fw_has_api(&mvm->fw->ucode_capa,









		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {








@@ -2962,7 +2963,7 @@ static void iwl_mvm_query_set_freqs(struct iwl_mvm *mvm,

















		for (i = 0; i < SCAN_OFFLOAD_MATCHING_CHANNELS_LEN * 8; i++)









			if (matches[idx].matching_channels[i / 8] & (BIT(i % 8)))









				match->channels[match->n_channels++] =









				match->channels[n_channels++] =









					mvm->nd_channels[i]->center_freq;









	} else {









		struct iwl_scan_offload_profile_match_v1 *matches =








@@ -2970,9 +2971,11 @@ static void iwl_mvm_query_set_freqs(struct iwl_mvm *mvm,

















		for (i = 0; i < SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1 * 8; i++)









			if (matches[idx].matching_channels[i / 8] & (BIT(i % 8)))









				match->channels[match->n_channels++] =









				match->channels[n_channels++] =









					mvm->nd_channels[i]->center_freq;









	}









	/* We may have ended up with fewer channels than we allocated. */









	match->n_channels = n_channels;









}



















/**








@@ -3053,6 +3056,8 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,







			     GFP_KERNEL);









	if (!net_detect || !n_matches)









		goto out_report_nd;









	net_detect->n_matches = n_matches;









	n_matches = 0;



















	for_each_set_bit(i, &matched_profiles, mvm->n_nd_match_sets) {









		struct cfg80211_wowlan_nd_match *match;








@@ -3066,8 +3071,9 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,







				GFP_KERNEL);









		if (!match)









			goto out_report_nd;









		match->n_channels = n_channels;



















		net_detect->matches[net_detect->n_matches++] = match;









		net_detect->matches[n_matches++] = match;



















		/* We inverted the order of the SSIDs in the scan









		 * request, so invert the index here.








@@ -3082,6 +3088,8 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,

















		iwl_mvm_query_set_freqs(mvm, d3_data->nd_results, match, i);









	}









	/* We may have fewer matches than we allocated. */









	net_detect->n_matches = n_matches;



















out_report_nd:









	wakeup.net_detect = net_detect;
































drivers/net/wireless/intel/iwlwifi/pcie/drv.c



+36
−1






























Original line number
Diff line number
Diff line







@@ -1106,19 +1106,54 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {







		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_name),



















/* Bz */









/* FIXME: need to change the naming according to the actual CRF */









	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_ax201_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_ax211_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_fm_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_wh_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_ax201_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_ax211_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_fm_name),



















	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,









		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,









		      iwl_cfg_bz, iwl_wh_name),



















/* Ga (Gl) */









	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,









		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,