From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 12 Sep 2025 00:50:46 +0000 (-0700)
Subject: Merge tag 'wireless-next-2025-09-11' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d103f26a5c8599385acb2d2e01dfbaedb00fdc0a;p=users%2Fhch%2Fmisc.git

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

Johannes Berg says:

====================
Plenty of things going on, notably:
 - iwlwifi: major cleanups/rework
 - brcmfmac: gets AP isolation support
 - mac80211: gets more S1G support

* tag 'wireless-next-2025-09-11' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (94 commits)
  wifi: mwifiex: fix endianness handling in mwifiex_send_rgpower_table
  wifi: cfg80211: Remove the redundant wiphy_dev
  wifi: mac80211: fix incorrect comment
  wifi: cfg80211: update the time stamps in hidden ssid
  wifi: mac80211: Fix HE capabilities element check
  wifi: mac80211: add tx_handlers_drop statistics to ethtool
  wifi: mac80211: fix reporting of all valid links in sta_set_sinfo()
  wifi: iwlwifi: mld: CHANNEL_SURVEY_NOTIF is always supported
  wifi: iwlwifi: mld: remove support of iwl_esr_mode_notif version 1
  wifi: iwlwifi: mld: remove support from of sta cmd version 1
  wifi: iwlwifi: mld: remove support of roc cmd version 5
  wifi: iwlwifi: mld: remove support of mac cmd ver 2
  wifi: iwlwifi: mld: don't consider phy cmd version 5
  wifi: iwlwifi: implement wowlan status notification API update
  wifi: iwlwifi: fw: Add ASUS to PPAG and TAS list
  wifi: iwlwifi: add kunit tests for nvm parse
  wifi: iwlwifi: api: add a flag to iwl_link_ctx_modify_flags
  wifi: iwlwifi: pcie: move ltr_enabled to the specific transport
  wifi: iwlwifi: pcie: move pm_support to the specific transport
  wifi: iwlwifi: rename iwl_finish_nic_init
  ...
====================

Link: https://patch.msgid.link/20250911100854.20445-3-johannes@sipsolutions.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

d103f26a5c8599385acb2d2e01dfbaedb00fdc0a
diff --cc drivers/net/wireless/intel/iwlwifi/fw/uefi.c
index 99a17b9323e9,44c7c565d1c6..4ae4d215e633
--- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
@@@ -742,17 -744,6 +744,12 @@@ int iwl_uefi_get_dsm(struct iwl_fw_runt
  		goto out;
  	}
  
- 	if (ARRAY_SIZE(data->functions) != UEFI_MAX_DSM_FUNCS) {
- 		IWL_DEBUG_RADIO(fwrt, "Invalid size of DSM functions array\n");
- 		goto out;
- 	}
- 
 +	if (!(data->functions[DSM_FUNC_QUERY] & BIT(func))) {
 +		IWL_DEBUG_RADIO(fwrt, "DSM func %d not in 0x%x\n",
 +				func, data->functions[DSM_FUNC_QUERY]);
 +		goto out;
 +	}
 +
  	*value = data->functions[func];
  
  	IWL_DEBUG_RADIO(fwrt,