github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
009b1dc8bf
linux/net/wireless
History
Jakub Kicinski 8d72997dab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR (net-7.1-rc7).

Silent conflicts:

net/wireless/nl80211.c
  cb9959ab5f ("wifi: cfg80211: enforce HE/EHT cap/oper consistency")
  a384ae9699 ("wifi: cfg80211: move AP HT/VHT/... operation to beacon info")
https://lore.kernel.org/aiGJDaHV4UlCexIQ@sirena.org.uk

Conflicts:

drivers/net/wireless/intel/iwlwifi/mld/ap.c
  a342c99cb7 ("wifi: iwlwifi: mld: honor BSS_CHANGED_BEACON_ENABLED")
  9bf1b409af ("wifi: iwlwifi: mld: send tx power constraints before link activation")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

drivers/net/wireless/intel/iwlwifi/pcie/drv.c
  093305d801 ("wifi: iwlwifi: pcie: simplify the resume flow if fast resume is not used")
  e2323929a6 ("wifi: iwlwifi: pcie: add debug print for resume flow if powered off")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

Adjacent changes:

drivers/net/ethernet/airoha/airoha_eth.c
  b38cae85d1 ("net: airoha: Fix use-after-free in metadata dst teardown")
  ec6c391bcc ("net: airoha: Introduce airoha_gdm_dev struct")

drivers/net/ethernet/microchip/lan743x_main.c
  8173d22b21 ("net: lan743x: permit VLAN-tagged packets up to configured MTU")
  e3c6508a46 ("net: lan743x: avoid netdev-based logging before netdev registration")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-06-04 15:29:04 -07:00
..
certs wifi: cfg80211: fix certs build to not depend on file order 2023-12-14 09:11:51 +01:00
tests wifi: cfg80211: add a function to parse UHR DBE 2026-05-20 12:03:19 +02:00
.gitignore .gitignore: add SPDX License Identifier 2020-03-25 11:50:48 +01:00
ap.c wifi: cfg80211: remove wdev mutex 2023-09-11 11:27:23 +02:00
chan.c wifi: cfg80211: add a function to parse UHR DBE 2026-05-20 12:03:19 +02:00
core.c wifi: cfg80211: don't allow NAN DATA on multi radio devices 2026-05-06 11:41:01 +02:00
core.h wifi: cfg80211: add start/stop proximity detection commands 2026-05-05 13:36:30 +02:00
debugfs.c wifi: cfg80211: Add parameters to radio-specific debugfs directories 2025-10-27 09:18:41 +01:00
debugfs.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ethtool.c wifi: cfg80211: Remove the redundant wiphy_dev 2025-09-10 15:05:48 +02:00
ibss.c wifi: cfg80211: support key installation on non-netdev wdevs 2026-03-02 11:28:33 +01:00
Kconfig wifi: cfg80211: stop exporting wext symbols 2024-10-08 21:53:31 +02:00
Makefile wifi: mac80211, cfg80211: Export michael_mic() and move it to cfg80211 2026-04-08 08:55:15 +02:00
mesh.c wifi: cfg80211: move DFS related members to links[] in wireless_dev 2024-09-06 13:01:05 +02:00
michael-mic.c wifi: cfg80211: Explicitly include <linux/export.h> in michael-mic.c 2026-04-09 08:54:43 +02:00
mlme.c wifi: cfg80211: ensure UHR ML-PM flag is consistent 2026-05-05 14:49:01 +02:00
nl80211.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-06-04 15:29:04 -07:00
nl80211.h wifi: cfg80211: allow representing NPCA in chandef 2026-05-05 14:49:02 +02:00
ocb.c wifi: cfg80211: remove wdev mutex 2023-09-11 11:27:23 +02:00
of.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
pmsr.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-05-07 11:19:07 -07:00
radiotap.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
rdev-ops.h wifi: cfg80211: add start/stop proximity detection commands 2026-05-05 13:36:30 +02:00
reg.c wifi: cfg80211/mac80211: Add NL80211_IFTYPE_PD for PD PASN and PMSR operations 2026-05-05 13:28:57 +02:00
reg.h wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
scan.c wifi: fix leak if split 6 GHz scanning fails 2026-06-03 09:32:45 +02:00
sme.c wifi: cfg80211: indicate (Re)Association frame encryption to userspace 2026-05-05 12:09:19 +02:00
sysfs.c Networking changes for 7.1. 2026-04-14 18:36:10 -07:00
sysfs.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
trace.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
trace.h wifi: cfg80211: allow representing NPCA in chandef 2026-05-05 14:49:02 +02:00
util.c wifi: cfg80211: add LTF keyseed support for secure ranging 2026-05-05 13:52:23 +02:00
wext-compat.c wifi: cfg80211: use strscpy in cfg80211_wext_giwname 2026-05-28 09:50:42 +02:00
wext-compat.h Revert "wifi: cfg80211: unexport wireless_nlevent_flush()" 2024-10-09 08:53:01 +02:00
wext-core.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
wext-priv.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
wext-proc.c wifi: Add SPDX ids to some files in the wireless subsystem 2026-03-06 10:54:23 +01:00
wext-sme.c wifi: cfg80211: define and use wiphy guard 2024-12-04 16:10:52 +01:00