Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-07--00-00 (v6.15-rc4-934-gfda123876cb1) remotes/brancher/net-next-2025-05-07--03-00 (v6.15-rc4-1109-gd6d8f8bc56ae) ==== BASE DIFF ==== .../bindings/net/ethernet-controller.yaml | 25 +- .../devicetree/bindings/net/network-class.yaml | 46 + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 2 +- .../bindings/net/wireless/qcom,ipq5332-wifi.yaml | 315 ++++++ .../bindings/net/wireless/silabs,wfx.yaml | 5 +- .../bindings/net/wireless/wireless-controller.yaml | 23 + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 5 +- Documentation/netlink/specs/devlink.yaml | 24 + drivers/bcma/driver_gpio.c | 8 +- drivers/net/can/m_can/m_can.c | 3 +- drivers/net/can/rockchip/rockchip_canfd-core.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 42 +- drivers/net/ethernet/intel/ice/ice_adapter.c | 47 +- drivers/net/ethernet/intel/ice/ice_adapter.h | 6 +- drivers/net/wireless/ath/ath10k/ahb.c | 2 +- drivers/net/wireless/ath/ath10k/bmi.c | 6 +- drivers/net/wireless/ath/ath10k/ce.c | 4 +- drivers/net/wireless/ath/ath10k/core.c | 4 +- drivers/net/wireless/ath/ath10k/htc.c | 6 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- drivers/net/wireless/ath/ath10k/mac.c | 22 +- drivers/net/wireless/ath/ath10k/pci.c | 2 +- drivers/net/wireless/ath/ath10k/testmode.c | 4 +- drivers/net/wireless/ath/ath10k/txrx.c | 2 +- drivers/net/wireless/ath/ath10k/usb.c | 4 +- drivers/net/wireless/ath/ath10k/wmi.c | 4 +- drivers/net/wireless/ath/ath11k/ahb.c | 4 +- drivers/net/wireless/ath/ath11k/core.c | 302 ++++- drivers/net/wireless/ath/ath11k/core.h | 16 + drivers/net/wireless/ath/ath11k/hif.h | 14 +- drivers/net/wireless/ath/ath11k/mac.c | 10 +- drivers/net/wireless/ath/ath11k/mhi.c | 14 +- drivers/net/wireless/ath/ath11k/mhi.h | 4 +- drivers/net/wireless/ath/ath11k/pci.c | 50 +- drivers/net/wireless/ath/ath11k/qmi.c | 4 +- drivers/net/wireless/ath/ath11k/testmode.c | 2 +- drivers/net/wireless/ath/ath12k/Kconfig | 8 + drivers/net/wireless/ath/ath12k/Makefile | 1 + drivers/net/wireless/ath/ath12k/ahb.c | 1156 ++++++++++++++++++++ drivers/net/wireless/ath/ath12k/ahb.h | 80 ++ drivers/net/wireless/ath/ath12k/ce.c | 92 +- drivers/net/wireless/ath/ath12k/ce.h | 18 +- drivers/net/wireless/ath/ath12k/core.c | 292 ++++- drivers/net/wireless/ath/ath12k/core.h | 97 +- drivers/net/wireless/ath/ath12k/debugfs.c | 234 ++-- drivers/net/wireless/ath/ath12k/debugfs.h | 12 +- .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 3 + drivers/net/wireless/ath/ath12k/dp.c | 88 +- drivers/net/wireless/ath/ath12k/dp.h | 25 +- drivers/net/wireless/ath/ath12k/dp_mon.c | 377 +++++-- drivers/net/wireless/ath/ath12k/dp_mon.h | 5 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 424 ++++--- drivers/net/wireless/ath/ath12k/dp_rx.h | 33 +- drivers/net/wireless/ath/ath12k/dp_tx.c | 145 ++- drivers/net/wireless/ath/ath12k/dp_tx.h | 3 +- drivers/net/wireless/ath/ath12k/fw.c | 9 +- drivers/net/wireless/ath/ath12k/fw.h | 3 +- drivers/net/wireless/ath/ath12k/hal.c | 111 +- drivers/net/wireless/ath/ath12k/hal.h | 76 +- drivers/net/wireless/ath/ath12k/hal_desc.h | 6 +- drivers/net/wireless/ath/ath12k/hal_rx.c | 19 +- drivers/net/wireless/ath/ath12k/hal_rx.h | 15 +- drivers/net/wireless/ath/ath12k/hw.c | 499 ++++++++- drivers/net/wireless/ath/ath12k/hw.h | 29 +- drivers/net/wireless/ath/ath12k/mac.c | 817 +++++++++----- drivers/net/wireless/ath/ath12k/mac.h | 13 + drivers/net/wireless/ath/ath12k/mhi.c | 9 +- drivers/net/wireless/ath/ath12k/pci.c | 58 +- drivers/net/wireless/ath/ath12k/pci.h | 5 +- drivers/net/wireless/ath/ath12k/peer.c | 5 +- drivers/net/wireless/ath/ath12k/peer.h | 3 +- drivers/net/wireless/ath/ath12k/qmi.c | 238 +++- drivers/net/wireless/ath/ath12k/qmi.h | 5 +- drivers/net/wireless/ath/ath12k/reg.c | 177 ++- drivers/net/wireless/ath/ath12k/reg.h | 2 +- drivers/net/wireless/ath/ath12k/testmode.c | 4 +- drivers/net/wireless/ath/ath12k/wmi.c | 327 +++++- drivers/net/wireless/ath/ath12k/wmi.h | 55 +- drivers/net/wireless/ath/wcn36xx/testmode.c | 2 +- drivers/net/wireless/ath/wil6210/txrx.h | 3 +- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 23 +- .../wireless/broadcom/brcm80211/brcmsmac/aiutils.c | 6 +- .../wireless/broadcom/brcm80211/brcmsmac/aiutils.h | 2 +- .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 4 +- .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 4 +- .../net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 2 +- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 +- .../wireless/broadcom/brcm80211/brcmsmac/main.c | 4 +- .../wireless/broadcom/brcm80211/brcmsmac/main.h | 2 +- .../net/wireless/broadcom/brcm80211/brcmsmac/pmu.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 3 + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 8 +- .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 9 +- drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 15 +- drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 16 +- drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 5 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +- drivers/net/wireless/intel/iwlwifi/fw/file.h | 28 + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 6 +- .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 17 +- .../net/wireless/intel/iwlwifi/iwl-context-info.h | 10 +- drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 20 +- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 36 +- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-utils.c | 1 - drivers/net/wireless/intel/iwlwifi/mld/d3.c | 2 + drivers/net/wireless/intel/iwlwifi/mld/fw.c | 45 +- drivers/net/wireless/intel/iwlwifi/mld/iface.c | 5 - drivers/net/wireless/intel/iwlwifi/mld/iface.h | 2 + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 9 - drivers/net/wireless/intel/iwlwifi/mld/mld.c | 16 +- drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 35 +- drivers/net/wireless/intel/iwlwifi/mld/notif.c | 51 +- drivers/net/wireless/intel/iwlwifi/mld/notif.h | 2 +- drivers/net/wireless/intel/iwlwifi/mld/rx.c | 97 +- drivers/net/wireless/intel/iwlwifi/mld/stats.c | 14 +- drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c | 14 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 9 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 25 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 - drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 14 +- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 21 +- .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 4 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 14 +- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 23 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 42 +- drivers/net/wireless/marvell/mwifiex/cfp.c | 4 +- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 74 +- drivers/net/wireless/marvell/mwifiex/init.c | 21 +- drivers/net/wireless/marvell/mwifiex/main.c | 43 +- drivers/net/wireless/marvell/mwifiex/main.h | 13 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 51 +- drivers/net/wireless/marvell/mwifiex/txrx.c | 3 +- drivers/net/wireless/marvell/mwifiex/util.c | 20 +- drivers/net/wireless/marvell/mwifiex/wmm.c | 12 +- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/virtual/mac80211_hwsim.c | 12 +- drivers/ssb/driver_gpio.c | 8 +- include/linux/ieee80211.h | 79 +- include/linux/netdevice.h | 1 + include/linux/skbuff.h | 3 - include/net/cfg80211.h | 44 +- include/net/devlink.h | 10 +- include/net/mac80211.h | 25 +- include/net/sock.h | 2 - include/uapi/linux/devlink.h | 15 + include/uapi/linux/nl80211.h | 6 + net/can/gw.c | 149 ++- net/core/dev.c | 18 +- net/core/dev_api.c | 23 + net/devlink/health.c | 52 +- net/devlink/netlink_gen.c | 29 +- net/devlink/param.c | 46 +- net/mac80211/cfg.c | 67 +- net/mac80211/chan.c | 3 + net/mac80211/debugfs_sta.c | 6 - net/mac80211/ibss.c | 19 +- net/mac80211/ieee80211_i.h | 16 +- net/mac80211/iface.c | 87 +- net/mac80211/link.c | 90 +- net/mac80211/mesh.c | 10 +- net/mac80211/mesh_pathtbl.c | 2 +- net/mac80211/mesh_plink.c | 10 +- net/mac80211/mlme.c | 16 +- net/mac80211/parse.c | 3 - net/mac80211/rate.c | 12 +- net/mac80211/rc80211_minstrel_ht.c | 13 +- net/mac80211/spectmgmt.c | 55 +- net/mac80211/sta_info.c | 28 - net/mac80211/sta_info.h | 11 - net/mac80211/tdls.c | 4 +- net/mac80211/tx.c | 35 +- net/mac80211/util.c | 25 +- net/wireless/nl80211.c | 42 +- net/wireless/scan.c | 2 +- tools/net/ynl/pyynl/ynl_gen_c.py | 58 +- tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 10 +- 182 files changed, 6599 insertions(+), 2119 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.jRA85vwV5e b/tmp/tmp.N76zwybcWQ index ac6d38f717d2..18580acdb73f 100644 --- a/tmp/tmp.jRA85vwV5e +++ b/tmp/tmp.N76zwybcWQ @@ -6,8 +6,8 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours -net/mlx5: support software TX timestamp -Merge tag 'wireless-2025-05-06' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless +virtio-net: fix total qstat values +net: export a helper for adding up queue stats netlink: specs: rt-link: remove implicit structs from devconf netlink: specs: remove implicit structs for SNMP counters netlink: specs: ovs: correct struct names @@ -22,15 +22,8 @@ fbnic: Actually flush_tx instead of stalling out fbnic: Add additional handling of IRQs fbnic: Gate AXI read/write enabling on FW mailbox fbnic: Fix initialization of mailbox descriptor rings -net/tun: expose queue utilization stats via ethtool openvswitch: Fix unsafe attribute parsing in output_userspace() net: Lock lower level devices when updating features -can: gw: fix RCU/BH usage in cgw_create_job() -can: mcan: m_can_class_unregister(): fix order of unregistration calls -can: rockchip_canfd: rkcanfd_remove(): fix order of unregistration calls -can: mcp251xfd: mcp251xfd_remove(): fix order of unregistration calls -can: mcp251xfd: fix TDC setting for low data bit rates -can: m_can: m_can_class_allocate_dev(): initialize spin lock on device probe xdp: Add helpers for head length, headroom, and metadata length net: ti: icssg-prueth: Report BQL before sending XDP packets net: ti: icssg-prueth: Fix kernel panic during concurrent Tx queue access @@ -48,10 +41,6 @@ net: pse-pd: Add support for PSE power domains net: pse-pd: tps23881: Add support for PSE events and interrupts net: pse-pd: Add support for reporting events net: ethtool: Add support for ethnl_info_init_ntf helper function -riscv: dts: sophgo: add ethernet GMAC device for sg2042 -net: stmmac: platform: Add snps,dwmac-5.00a IP compatible string -net: stmmac: dwmac-sophgo: Add support for Sophgo SG2042 SoC -dt-bindings: net: sophgo,sg2044-dwmac: Add support for Sophgo SG2042 dwmac net: enetc: add loopback support for i.MX95 ENETC PF net: enetc: add VLAN filtering support for i.MX95 ENETC PF net: enetc: move generic VLAN hash filter functions to enetc_pf_common.c @@ -67,10 +56,6 @@ net: enetc: move generic MAC filtering interfaces to enetc-core net: enetc: add command BD ring support for i.MX95 ENETC net: enetc: add initial netc-lib driver to support NTMP hinic3: module initialization and tx/rx logic -net: add missing instance lock to dev_set_promiscuity -selftests/tc-testing: Add qdisc limit trimming tests -net_sched: Flush gso_skb list too during ->change() -net: Lock netdevices during dev_shutdown tools: ynl-gen: move the count into a presence struct too tools: ynl-gen: split presence metadata tools: ynl-gen: rename basic presence from 'bit' to 'present' @@ -83,12 +68,6 @@ net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_ucast() net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_vlan_add_modify() net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_vlan() net: ethernet: ti: cpsw_ale: Update Policer fields for more ALE size/ports -ice: use DSN instead of PCI BDF for ice_adapter index -devlink: use DEVLINK_VAR_ATTR_TYPE_* instead of NLA_* in fmsg -devlink: avoid param type value translations -devlink: define enum for attr types of dynamic attributes -tools: ynl-gen: allow noncontiguous enums -net: mctp: Don't access ifa_index when missing net: usb: lan78xx: Extract flow control configuration to helper net: usb: lan78xx: Refactor USB link power configuration into helper net: usb: lan78xx: Extract PHY interrupt acknowledgment to helper @@ -96,7 +75,6 @@ net: usb: lan78xx: move LED DT configuration to helper net: usb: lan78xx: refactor PHY init to separate detection and MAC configuration net: usb: lan78xx: remove explicit check for missing PHY driver net: usb: lan78xx: Improve error handling in PHY initialization -net: lan743x: configure interrupt moderation timers based on speed net: phy: micrel: remove KSZ9477 EEE quirks now handled by phylink net: dsa: microchip: let phylink manage PHY EEE configuration on KSZ switches net: dsa: b53: do not set learning and unicast/multicast on up @@ -110,6 +88,3 @@ net: dsa: b53: fix flushing old pvid VLAN on pvid change net: dsa: b53: fix clearing PVID of a port net: dsa: b53: keep CPU port always tagged again net: dsa: b53: allow leaky reserved multicast -wifi: iwlwifi: add support for Killer on MTL -wifi: mac80211: fix the type of status_code for negotiated TID to Link Mapping -wifi: cfg80211: fix out-of-bounds access during multi-link element defragmentation