Jakub Kicinski 6a4c4656b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR (net-7.1-rc3).

Conflicts:

net/ipv4/igmp.c
  726fa7da2d ("ipv4: igmp: get rid of IGMPV3_{QQIC,MRC} and simplify calculation")
  c6bebaa744 ("ipv4: igmp: annotate data-races in igmp_heard_query()")
https://lore.kernel.org/a7365e4873340f7a5e30411207de3bf9@kernel.org

Adjacent changes:

net/psp/psp_main.c
  30cb24f97d ("psp: strip variable-length PSP header in psp_dev_rcv()")
  c2b22277ad ("psp: validate IPv4 header fields in psp_dev_rcv()")

net/sched/sch_fq_codel.c
  f83e07b292 ("net/sched: sch_fq_codel: annotate data-races from fq_codel_dump_class_stats()")
  3f3aa77ff1 ("net/sched: add qstats_cpu_drop_inc() helper")

net/wireless/pmsr.c
  0f3c0a1973 ("wifi: nl80211: fix NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST usage")
  410aa47fd9 ("wifi: cfg80211: allow suppressing FTM result reporting for PD requests")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2026-05-07 11:19:07 -07:00

..

certs

wifi: cfg80211: fix certs build to not depend on file order

2023-12-14 09:11:51 +01:00

tests

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

.gitignore

…

ap.c

wifi: cfg80211: remove wdev mutex

2023-09-11 11:27:23 +02:00

chan.c

wifi: cfg80211: separate NPCA validity from chandef validity

2026-05-05 14:49:04 +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

…

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-05-07 11:19:07 -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

Convert 'alloc_flex' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

sme.c

wifi: cfg80211: indicate (Re)Association frame encryption to userspace

2026-05-05 12:09:19 +02:00

sysfs.c

Merge tag 'net-next-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2026-04-14 18:36:10 -07:00

sysfs.h

…

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: validate cipher suite for NAN Data keys

2026-04-28 09:31:12 +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