Pull networking fixes from Jakub Kicinski: "Including fixes from wireless. The ath12k fix to avoid FW crashes requires adding support for a number of new FW commands so it's quite large in terms of LoC. The rest is relatively small. Current release - fix to a fix: - ptp: fix breakage after ptp_vclock_in_use() rework Current release - regressions: - openvswitch: allocate struct ovs_pcpu_storage dynamically, static allocation may exhaust module loader limit on smaller systems Previous releases - regressions: - tcp: fix tcp_packet_delayed() for peers with no selective ACK support Previous releases - always broken: - wifi: ath12k: don't activate more links than firmware supports - tcp: make sure sockets open via passive TFO have valid NAPI ID - eth: bnxt_en: update MRU and RSS table of RSS contexts on queue reset, prevent Rx queues from silently hanging after queue reset - NFC: uart: set tty->disc_data only in success path" * tag 'net-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (59 commits) net: airoha: Differentiate hwfd buffer size for QDMA0 and QDMA1 net: airoha: Compute number of descriptors according to reserved memory size tools: ynl: fix mixing ops and notifications on one socket net: atm: fix /proc/net/atm/lec handling net: atm: add lec_mutex mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available net: airoha: Always check return value from airoha_ppe_foe_get_entry() NFC: nci: uart: Set tty->disc_data only in success path calipso: Fix null-ptr-deref in calipso_req_{set,del}attr(). MAINTAINERS: Remove Shannon Nelson from MAINTAINERS file net: lan743x: fix potential out-of-bounds write in lan743x_ptp_io_event_clock_get() eth: fbnic: avoid double free when failing to DMA-map FW msg tcp: fix passive TFO socket having invalid NAPI ID selftests: net: add test for passive TFO socket NAPI ID selftests: net: add passive TFO test binary selftests: netdevsim: improve lib.sh include in peer.sh tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer Octeontx2-pf: Fix Backpresure configuration net: ftgmac100: select FIXED_PHY net: ethtool: remove duplicate defines for family info ...
Showing the changes to include/uapi/linux (2 of 64 files). Show all
Unified · Split
| @@ -208,10 +208,6 @@ enum { · 207 unmodified lines | |||
| 208 | ETHTOOL_A_STATS_PHY_MAX = (__ETHTOOL_A_STATS_PHY_CNT - 1) | 208 | ETHTOOL_A_STATS_PHY_MAX = (__ETHTOOL_A_STATS_PHY_CNT - 1) |
| 209 | }; | 209 | }; |
| 210 | 210 | ||
| 211 | /* generic netlink info */ | ||
| 212 | #define ETHTOOL_GENL_NAME "ethtool" | ||
| 213 | #define ETHTOOL_GENL_VERSION 1 | ||
| 214 | |||
| 215 | #define ETHTOOL_MCGRP_MONITOR_NAME "monitor" | 211 | #define ETHTOOL_MCGRP_MONITOR_NAME "monitor" |
| 216 | 212 | ||
| 217 | #endif /* _UAPI_LINUX_ETHTOOL_NETLINK_H_ */ | 213 | #endif /* _UAPI_LINUX_ETHTOOL_NETLINK_H_ */ |
| @@ -6,8 +6,8 @@ · 5 unmodified lines | |||
| 6 | #ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H | 6 | #ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H |
| 7 | #define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H | 7 | #define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H |
| 8 | 8 | ||
| 9 | #define ETHTOOL_FAMILY_NAME "ethtool" | 9 | #define ETHTOOL_GENL_NAME "ethtool" |
| 10 | #define ETHTOOL_FAMILY_VERSION 1 | 10 | #define ETHTOOL_GENL_VERSION 1 |
| 11 | 11 | ||
| 12 | enum { | 12 | enum { |
| 13 | ETHTOOL_UDP_TUNNEL_TYPE_VXLAN, | 13 | ETHTOOL_UDP_TUNNEL_TYPE_VXLAN, |