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

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

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

Johannes Berg says:

====================
The usual features/cleanups/etc., notably:

 - rtw88: IBSS mode for SDIO devices
 - rtw89:
   - BT coex for MLO/WiFi7
   - work on station + P2P concurrency
 - ath: fix W=2 export.h warnings
 - ath12k: fix scan on multi-radio devices
 - cfg80211/mac80211: MLO statistics
 - mac80211: S1G aggregation
 - cfg80211/mac80211: per-radio RTS threshold

* tag 'wireless-next-2025-06-25' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (171 commits)
  wifi: iwlwifi: dvm: fix potential overflow in rs_fill_link_cmd()
  iwlwifi: Add missing check for alloc_ordered_workqueue
  wifi: iwlwifi: Fix memory leak in iwl_mvm_init()
  iwlwifi: api: delete repeated words
  iwlwifi: remove unused no_sleep_autoadjust declaration
  iwlwifi: Fix comment typo
  iwlwifi: use DECLARE_BITMAP macro
  iwlwifi: fw: simplify the iwl_fw_dbg_collect_trig()
  wifi: iwlwifi: mld: ftm: fix switch end indentation
  MAINTAINERS: update iwlwifi git link
  wifi: iwlwifi: pcie: fix non-MSIX handshake register
  wifi: iwlwifi: mld: don't exit EMLSR when we shouldn't
  wifi: iwlwifi: move _iwl_trans_set_bits_mask utilities
  wifi: iwlwifi: mld: make iwl_mld_add_all_rekeys void
  wifi: iwlwifi: move iwl_trans_pcie_write_mem to iwl-trans.c
  wifi: iwlwifi: pcie: move iwl_trans_pcie_dump_regs() to utils.c
  wifi: iwlwifi: mld: advertise support for TTLM changes
  wifi: iwlwifi: mld: Block EMLSR when scanning on P2P Device
  wifi: iwlwifi: mld: use the correct struct size for tracing
  wifi: iwlwifi: support RZL platform device ID
  ...
====================

Link: https://patch.msgid.link/20250625120135.41933-55-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8dacfd92 c73ebc0d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12521,7 +12521,7 @@ M: Miri Korenblit <miriam.rachel.korenblit@intel.com> 
L:	linux-wireless@vger.kernel.org

S:	Supported

W:	https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

T:	git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git/

F:	drivers/net/wireless/intel/iwlwifi/









INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
































drivers/net/wireless/admtek/adm8211.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1293,7 +1293,7 @@ static void adm8211_set_bssid(struct ieee80211_hw *dev, const u8 *bssid)







	ADM8211_CSR_WRITE(ABDA1, reg);









}



















static int adm8211_config(struct ieee80211_hw *dev, u32 changed)









static int adm8211_config(struct ieee80211_hw *dev, int radio_idx, u32 changed)









{









	struct adm8211_priv *priv = dev->priv;









	struct ieee80211_conf *conf = &dev->conf;
































drivers/net/wireless/ath/ar5523/ar5523.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -1083,7 +1083,8 @@ static void ar5523_stop(struct ieee80211_hw *hw, bool suspend)







	mutex_unlock(&ar->mutex);









}



















static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, u32 value)









static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,









				    u32 value)









{









	struct ar5523 *ar = hw->priv;









	int ret;








@@ -1137,7 +1138,7 @@ static void ar5523_remove_interface(struct ieee80211_hw *hw,







	ar->vif = NULL;









}



















static int ar5523_hwconfig(struct ieee80211_hw *hw, u32 changed)









static int ar5523_hwconfig(struct ieee80211_hw *hw, int radio_idx, u32 changed)









{









	struct ar5523 *ar = hw->priv;










































drivers/net/wireless/ath/ath10k/bmi.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -3,8 +3,10 @@







 * Copyright (c) 2005-2011 Atheros Communications Inc.









 * Copyright (c) 2011-2014,2016-2017 Qualcomm Atheros, Inc.









 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.









 * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.









 */



















#include <linux/export.h>









#include "bmi.h"









#include "hif.h"









#include "debug.h"
































drivers/net/wireless/ath/ath10k/ce.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -4,8 +4,10 @@







 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.









 * Copyright (c) 2018 The Linux Foundation. All rights reserved.









 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.









 * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.









 */



















#include <linux/export.h>









#include "hif.h"









#include "ce.h"









#include "debug.h"