Commit 010c40c1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2025-06-25' of... 

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

Johannes Berg says:

====================
Just a few fixes:
 - iwlegacy: work around large stack with clang/kasan
 - mac80211: fix integer overflow
 - mac80211: fix link struct init vs. RCU publish
 - iwlwifi: fix warning on IFF_UP

* tag 'wireless-2025-06-25' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211: finish link init before RCU publish
  wifi: iwlwifi: mvm: assume '1' as the default mac_config_cmd version
  wifi: mac80211: fix beacon interval calculation overflow
  wifi: iwlegacy: work around excessive stack usage on clang/kasan
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9caca6ac 95b922dd

drivers/net/wireless/intel/iwlegacy/4965-rs.c

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ il4965_rs_extract_rate(u32 rate_n_flags) 
	return (u8) (rate_n_flags & 0xFF);

}



static void

/* noinline works around https://github.com/llvm/llvm-project/issues/143908 */

static noinline_for_stack void

il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)

{

	win->data = 0;

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
	unsigned int link_id;

	int cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

					    WIDE_ID(MAC_CONF_GROUP,

						    MAC_CONFIG_CMD), 0);

						    MAC_CONFIG_CMD), 1);



	if (WARN_ON(cmd_ver < 1 || cmd_ver > 3))

	if (WARN_ON(cmd_ver > 3))

		return;



	cmd->id_and_color = cpu_to_le32(mvmvif->id);

net/mac80211/link.c

+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ void ieee80211_link_init(struct ieee80211_sub_if_data *sdata, 
	if (link_id < 0)

		link_id = 0;



	rcu_assign_pointer(sdata->vif.link_conf[link_id], link_conf);

	rcu_assign_pointer(sdata->link[link_id], link);



	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {

		struct ieee80211_sub_if_data *ap_bss;

		struct ieee80211_bss_conf *ap_bss_conf;
@@ -145,6 +142,9 @@ void ieee80211_link_init(struct ieee80211_sub_if_data *sdata, 


		ieee80211_link_debugfs_add(link);

	}



	rcu_assign_pointer(sdata->vif.link_conf[link_id], link_conf);

	rcu_assign_pointer(sdata->link[link_id], link);

}



void ieee80211_link_stop(struct ieee80211_link_data *link)

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -3884,7 +3884,7 @@ void ieee80211_recalc_dtim(struct ieee80211_local *local, 
{

	u64 tsf = drv_get_tsf(local, sdata);

	u64 dtim_count = 0;

	u16 beacon_int = sdata->vif.bss_conf.beacon_int * 1024;

	u32 beacon_int = sdata->vif.bss_conf.beacon_int * 1024;

	u8 dtim_period = sdata->vif.bss_conf.dtim_period;

	struct ps_data *ps;

	u8 bcns_from_dtim;