Pull networking changes from Paolo Abeni: "Core: - Refactor the forward memory allocation to better cope with memory pressure with many open sockets, moving from a per socket cache to a per-CPU one - Replace rwlocks with RCU for better fairness in ping, raw sockets and IP multicast router. - Network-side support for IO uring zero-copy send. - A few skb drop reason improvements, including codegen the source file with string mapping instead of using macro magic. - Rename reference tracking helpers to a more consistent netdev_* schema. - Adapt u64_stats_t type to address load/store tearing issues. - Refine debug helper usage to reduce the log noise caused by bots. BPF: - Improve socket map performance, avoiding skb cloning on read operation. - Add support for 64 bits enum, to match types exposed by kernel. - Introduce support for sleepable uprobes program. - Introduce support for enum textual representation in libbpf. - New helpers to implement synproxy with eBPF/XDP. - Improve loop performances, inlining indirect calls when possible. - Removed all the deprecated libbpf APIs. - Implement new eBPF-based LSM flavor. - Add type match support, which allow accurate queries to the eBPF used types. - A few TCP congetsion control framework usability improvements. - Add new infrastructure to manipulate CT entries via eBPF programs. - Allow for livepatch (KLP) and BPF trampolines to attach to the same kernel function. Protocols: - Introduce per network namespace lookup tables for unix sockets, increasing scalability and reducing contention. - Preparation work for Wi-Fi 7 Multi-Link Operation (MLO) support. - Add support to forciby close TIME_WAIT TCP sockets via user-space tools. - Significant performance improvement for the TLS 1.3 receive path, both for zero-copy and not-zero-copy. - Support for changing the initial MTPCP subflow priority/backup status - Introduce virtually contingus buffers for sockets over RDMA, to cope better with memory pressure. - Extend CAN ethtool support with timestamping capabilities - Refactor CAN build infrastructure to allow building only the needed features. Driver API: - Remove devlink mutex to allow parallel commands on multiple links. - Add support for pause stats in distributed switch. - Implement devlink helpers to query and flash line cards. - New helper for phy mode to register conversion. New hardware / drivers: - Ethernet DSA driver for the rockchip mt7531 on BPI-R2 Pro. - Ethernet DSA driver for the Renesas RZ/N1 A5PSW switch. - Ethernet DSA driver for the Microchip LAN937x switch. - Ethernet PHY driver for the Aquantia AQR113C EPHY. - CAN driver for the OBD-II ELM327 interface. - CAN driver for RZ/N1 SJA1000 CAN controller. - Bluetooth: Infineon CYW55572 Wi-Fi plus Bluetooth combo device. Drivers: - Intel Ethernet NICs: - i40e: add support for vlan pruning - i40e: add support for XDP framented packets - ice: improved vlan offload support - ice: add support for PPPoE offload - Mellanox Ethernet (mlx5) - refactor packet steering offload for performance and scalability - extend support for TC offload - refactor devlink code to clean-up the locking schema - support stacked vlans for bridge offloads - use TLS objects pool to improve connection rate - Netronome Ethernet NICs (nfp): - extend support for IPv6 fields mangling offload - add support for vepa mode in HW bridge - better support for virtio data path acceleration (VDPA) - enable TSO by default - Microsoft vNIC driver (mana) - add support for XDP redirect - Others Ethernet drivers: - bonding: add per-port priority support - microchip lan743x: extend phy support - Fungible funeth: support UDP segmentation offload and XDP xmit - Solarflare EF100: add support for virtual function representors - MediaTek SoC: add XDP support - Mellanox Ethernet/IB switch (mlxsw): - dropped support for unreleased H/W (XM router). - improved stats accuracy - unified bridge model coversion improving scalability (parts 1-6) - support for PTP in Spectrum-2 asics - Broadcom PHYs - add PTP support for BCM54210E - add support for the BCM53128 internal PHY - Marvell Ethernet switches (prestera): - implement support for multicast forwarding offload - Embedded Ethernet switches: - refactor OcteonTx MAC filter for better scalability - improve TC H/W offload for the Felix driver - refactor the Microchip ksz8 and ksz9477 drivers to share the probe code (parts 1, 2), add support for phylink mac configuration - Other WiFi: - Microchip wilc1000: diable WEP support and enable WPA3 - Atheros ath10k: encapsulation offload support Old code removal: - Neterion vxge ethernet driver: this is untouched since more than 10 years" * tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1890 commits) doc: sfp-phylink: Fix a broken reference wireguard: selftests: support UML wireguard: allowedips: don't corrupt stack when detecting overflow wireguard: selftests: update config fragments wireguard: ratelimiter: use hrtimer in selftest net/mlx5e: xsk: Discard unaligned XSK frames on striding RQ net: usb: ax88179_178a: Bind only to vendor-specific interface selftests: net: fix IOAM test skip return code net: usb: make USB_RTL8153_ECM non user configurable net: marvell: prestera: remove reduntant code octeontx2-pf: Reduce minimum mtu size to 60 net: devlink: Fix missing mutex_unlock() call net/tls: Remove redundant workqueue flush before destroy net: txgbe: Fix an error handling path in txgbe_probe() net: dsa: Fix spelling mistakes and cleanup code Documentation: devlink: add add devlink-selftests to the table of contents dccp: put dccp_qpolicy_full() and dccp_qpolicy_push() in the same lock net: ionic: fix error check for vlan flags in ionic_set_nic_features() net: ice: fix error NETIF_F_HW_VLAN_CTAG_FILTER check in ice_vsi_sync_fltr() nfp: flower: add support for tunnel offload without key ID ...
Showing the changes to include/uapi (16 of 1753 files). Show all
Unified · Split
| @@ -998,6 +998,7 @@ enum bpf_attach_type { · 997 unmodified lines | ||
| 998 | 998 | BPF_SK_REUSEPORT_SELECT_OR_MIGRATE, |
| 999 | 999 | BPF_PERF_EVENT, |
| 1000 | 1000 | BPF_TRACE_KPROBE_MULTI, |
| 1001 | + BPF_LSM_CGROUP, | |
| 1001 | 1002 | __MAX_BPF_ATTACH_TYPE |
| 1002 | 1003 | }; |
| 1003 | 1004 | |
| @@ -1431,6 +1432,7 @@ union bpf_attr { · 427 unmodified lines | ||
| 1431 | 1432 | __u32 attach_flags; |
| 1432 | 1433 | __aligned_u64 prog_ids; |
| 1433 | 1434 | __u32 prog_cnt; |
| 1435 | + __aligned_u64 prog_attach_flags; /* output: per-program attach_flags */ | |
| 1434 | 1436 | } query; |
| 1435 | 1437 | |
| 1436 | 1438 | struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */ |
| @@ -2359,7 +2361,8 @@ union bpf_attr { · 922 unmodified lines | ||
| 2359 | 2361 | * Pull in non-linear data in case the *skb* is non-linear and not |
| 2360 | 2362 | * all of *len* are part of the linear section. Make *len* bytes |
| 2361 | 2363 | * from *skb* readable and writable. If a zero value is passed for |
| 2362 | − * *len*, then the whole length of the *skb* is pulled. | |
| 2364 | + * *len*, then all bytes in the linear part of *skb* will be made | |
| 2365 | + * readable and writable. | |
| 2363 | 2366 | * |
| 2364 | 2367 | * This helper is only needed for reading and writing with direct |
| 2365 | 2368 | * packet access. |
| @@ -3597,10 +3600,11 @@ union bpf_attr { · 1231 unmodified lines | ||
| 3597 | 3600 | * |
| 3598 | 3601 | * *iph* points to the start of the IPv4 or IPv6 header, while |
| 3599 | 3602 | * *iph_len* contains **sizeof**\ (**struct iphdr**) or |
| 3600 | − * **sizeof**\ (**struct ip6hdr**). | |
| 3603 | + * **sizeof**\ (**struct ipv6hdr**). | |
| 3601 | 3604 | * |
| 3602 | 3605 | * *th* points to the start of the TCP header, while *th_len* |
| 3603 | − * contains **sizeof**\ (**struct tcphdr**). | |
| 3606 | + * contains the length of the TCP header (at least | |
| 3607 | + * **sizeof**\ (**struct tcphdr**)). | |
| 3604 | 3608 | * Return |
| 3605 | 3609 | * 0 if *iph* and *th* are a valid SYN cookie ACK, or a negative |
| 3606 | 3610 | * error otherwise. |
| @@ -3783,10 +3787,11 @@ union bpf_attr { · 176 unmodified lines | ||
| 3783 | 3787 | * |
| 3784 | 3788 | * *iph* points to the start of the IPv4 or IPv6 header, while |
| 3785 | 3789 | * *iph_len* contains **sizeof**\ (**struct iphdr**) or |
| 3786 | − * **sizeof**\ (**struct ip6hdr**). | |
| 3790 | + * **sizeof**\ (**struct ipv6hdr**). | |
| 3787 | 3791 | * |
| 3788 | 3792 | * *th* points to the start of the TCP header, while *th_len* |
| 3789 | − * contains the length of the TCP header. | |
| 3793 | + * contains the length of the TCP header with options (at least | |
| 3794 | + * **sizeof**\ (**struct tcphdr**)). | |
| 3790 | 3795 | * Return |
| 3791 | 3796 | * On success, lower 32 bits hold the generated SYN cookie in |
| 3792 | 3797 | * followed by 16 bits which hold the MSS value for that cookie, |
| @@ -5252,6 +5257,80 @@ union bpf_attr { · 1459 unmodified lines | ||
| 5252 | 5257 | * Pointer to the underlying dynptr data, NULL if the dynptr is |
| 5253 | 5258 | * read-only, if the dynptr is invalid, or if the offset and length |
| 5254 | 5259 | * is out of bounds. |
| 5260 | + * | |
| 5261 | + * s64 bpf_tcp_raw_gen_syncookie_ipv4(struct iphdr *iph, struct tcphdr *th, u32 th_len) | |
| 5262 | + * Description | |
| 5263 | + * Try to issue a SYN cookie for the packet with corresponding | |
| 5264 | + * IPv4/TCP headers, *iph* and *th*, without depending on a | |
| 5265 | + * listening socket. | |
| 5266 | + * | |
| 5267 | + * *iph* points to the IPv4 header. | |
| 5268 | + * | |
| 5269 | + * *th* points to the start of the TCP header, while *th_len* | |
| 5270 | + * contains the length of the TCP header (at least | |
| 5271 | + * **sizeof**\ (**struct tcphdr**)). | |
| 5272 | + * Return | |
| 5273 | + * On success, lower 32 bits hold the generated SYN cookie in | |
| 5274 | + * followed by 16 bits which hold the MSS value for that cookie, | |
| 5275 | + * and the top 16 bits are unused. | |
| 5276 | + * | |
| 5277 | + * On failure, the returned value is one of the following: | |
| 5278 | + * | |
| 5279 | + * **-EINVAL** if *th_len* is invalid. | |
| 5280 | + * | |
| 5281 | + * s64 bpf_tcp_raw_gen_syncookie_ipv6(struct ipv6hdr *iph, struct tcphdr *th, u32 th_len) | |
| 5282 | + * Description | |
| 5283 | + * Try to issue a SYN cookie for the packet with corresponding | |
| 5284 | + * IPv6/TCP headers, *iph* and *th*, without depending on a | |
| 5285 | + * listening socket. | |
| 5286 | + * | |
| 5287 | + * *iph* points to the IPv6 header. | |
| 5288 | + * | |
| 5289 | + * *th* points to the start of the TCP header, while *th_len* | |
| 5290 | + * contains the length of the TCP header (at least | |
| 5291 | + * **sizeof**\ (**struct tcphdr**)). | |
| 5292 | + * Return | |
| 5293 | + * On success, lower 32 bits hold the generated SYN cookie in | |
| 5294 | + * followed by 16 bits which hold the MSS value for that cookie, | |
| 5295 | + * and the top 16 bits are unused. | |
| 5296 | + * | |
| 5297 | + * On failure, the returned value is one of the following: | |
| 5298 | + * | |
| 5299 | + * **-EINVAL** if *th_len* is invalid. | |
| 5300 | + * | |
| 5301 | + * **-EPROTONOSUPPORT** if CONFIG_IPV6 is not builtin. | |
| 5302 | + * | |
| 5303 | + * long bpf_tcp_raw_check_syncookie_ipv4(struct iphdr *iph, struct tcphdr *th) | |
| 5304 | + * Description | |
| 5305 | + * Check whether *iph* and *th* contain a valid SYN cookie ACK | |
| 5306 | + * without depending on a listening socket. | |
| 5307 | + * | |
| 5308 | + * *iph* points to the IPv4 header. | |
| 5309 | + * | |
| 5310 | + * *th* points to the TCP header. | |
| 5311 | + * Return | |
| 5312 | + * 0 if *iph* and *th* are a valid SYN cookie ACK. | |
| 5313 | + * | |
| 5314 | + * On failure, the returned value is one of the following: | |
| 5315 | + * | |
| 5316 | + * **-EACCES** if the SYN cookie is not valid. | |
| 5317 | + * | |
| 5318 | + * long bpf_tcp_raw_check_syncookie_ipv6(struct ipv6hdr *iph, struct tcphdr *th) | |
| 5319 | + * Description | |
| 5320 | + * Check whether *iph* and *th* contain a valid SYN cookie ACK | |
| 5321 | + * without depending on a listening socket. | |
| 5322 | + * | |
| 5323 | + * *iph* points to the IPv6 header. | |
| 5324 | + * | |
| 5325 | + * *th* points to the TCP header. | |
| 5326 | + * Return | |
| 5327 | + * 0 if *iph* and *th* are a valid SYN cookie ACK. | |
| 5328 | + * | |
| 5329 | + * On failure, the returned value is one of the following: | |
| 5330 | + * | |
| 5331 | + * **-EACCES** if the SYN cookie is not valid. | |
| 5332 | + * | |
| 5333 | + * **-EPROTONOSUPPORT** if CONFIG_IPV6 is not builtin. | |
| 5255 | 5334 | */ |
| 5256 | 5335 | #define __BPF_FUNC_MAPPER(FN) \ |
| 5257 | 5336 | FN(unspec), \ |
| @@ -5458,6 +5537,10 @@ union bpf_attr { · 200 unmodified lines | ||
| 5458 | 5537 | FN(dynptr_read), \ |
| 5459 | 5538 | FN(dynptr_write), \ |
| 5460 | 5539 | FN(dynptr_data), \ |
| 5540 | + FN(tcp_raw_gen_syncookie_ipv4), \ | |
| 5541 | + FN(tcp_raw_gen_syncookie_ipv6), \ | |
| 5542 | + FN(tcp_raw_check_syncookie_ipv4), \ | |
| 5543 | + FN(tcp_raw_check_syncookie_ipv6), \ | |
| 5461 | 5544 | /* */ |
| 5462 | 5545 | |
| 5463 | 5546 | /* integer value in 'imm' field of BPF_CALL instruction selects which helper |
| @@ -5998,6 +6081,8 @@ struct bpf_prog_info { · 534 unmodified lines | ||
| 5998 | 6081 | __u64 run_cnt; |
| 5999 | 6082 | __u64 recursion_misses; |
| 6000 | 6083 | __u32 verified_insns; |
| 6084 | + __u32 attach_btf_obj_id; | |
| 6085 | + __u32 attach_btf_id; | |
| 6001 | 6086 | } __attribute__((aligned(8))); |
| 6002 | 6087 | |
| 6003 | 6088 | struct bpf_map_info { |
| @@ -6705,6 +6790,7 @@ enum bpf_core_relo_kind { · 701 unmodified lines | ||
| 6705 | 6790 | BPF_CORE_TYPE_SIZE = 9, /* type size in bytes */ |
| 6706 | 6791 | BPF_CORE_ENUMVAL_EXISTS = 10, /* enum value existence in target kernel */ |
| 6707 | 6792 | BPF_CORE_ENUMVAL_VALUE = 11, /* enum value integer value */ |
| 6793 | + BPF_CORE_TYPE_MATCHES = 12, /* type match in target kernel */ | |
| 6708 | 6794 | }; |
| 6709 | 6795 | |
| 6710 | 6796 | /* |
| @@ -36,10 +36,10 @@ struct btf_type { · 35 unmodified lines | ||
| 36 | 36 | * bits 24-28: kind (e.g. int, ptr, array...etc) |
| 37 | 37 | * bits 29-30: unused |
| 38 | 38 | * bit 31: kind_flag, currently used by |
| 39 | − * struct, union and fwd | |
| 39 | + * struct, union, enum, fwd and enum64 | |
| 40 | 40 | */ |
| 41 | 41 | __u32 info; |
| 42 | − /* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC. | |
| 42 | + /* "size" is used by INT, ENUM, STRUCT, UNION, DATASEC and ENUM64. | |
| 43 | 43 | * "size" tells the size of the type it is describing. |
| 44 | 44 | * |
| 45 | 45 | * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT, |
| @@ -63,7 +63,7 @@ enum { · 17 unmodified lines | ||
| 63 | 63 | BTF_KIND_ARRAY = 3, /* Array */ |
| 64 | 64 | BTF_KIND_STRUCT = 4, /* Struct */ |
| 65 | 65 | BTF_KIND_UNION = 5, /* Union */ |
| 66 | − BTF_KIND_ENUM = 6, /* Enumeration */ | |
| 66 | + BTF_KIND_ENUM = 6, /* Enumeration up to 32-bit values */ | |
| 67 | 67 | BTF_KIND_FWD = 7, /* Forward */ |
| 68 | 68 | BTF_KIND_TYPEDEF = 8, /* Typedef */ |
| 69 | 69 | BTF_KIND_VOLATILE = 9, /* Volatile */ |
| @@ -76,6 +76,7 @@ enum { · 6 unmodified lines | ||
| 76 | 76 | BTF_KIND_FLOAT = 16, /* Floating point */ |
| 77 | 77 | BTF_KIND_DECL_TAG = 17, /* Decl Tag */ |
| 78 | 78 | BTF_KIND_TYPE_TAG = 18, /* Type Tag */ |
| 79 | + BTF_KIND_ENUM64 = 19, /* Enumeration up to 64-bit values */ | |
| 79 | 80 | |
| 80 | 81 | NR_BTF_KINDS, |
| 81 | 82 | BTF_KIND_MAX = NR_BTF_KINDS - 1, |
| @@ -186,4 +187,14 @@ struct btf_decl_tag { · 104 unmodified lines | ||
| 186 | 187 | __s32 component_idx; |
| 187 | 188 | }; |
| 188 | 189 | |
| 190 | +/* BTF_KIND_ENUM64 is followed by multiple "struct btf_enum64". | |
| 191 | + * The exact number of btf_enum64 is stored in the vlen (of the | |
| 192 | + * info in "struct btf_type"). | |
| 193 | + */ | |
| 194 | +struct btf_enum64 { | |
| 195 | + __u32 name_off; | |
| 196 | + __u32 val_lo32; | |
| 197 | + __u32 val_hi32; | |
| 198 | +}; | |
| 199 | + | |
| 189 | 200 | #endif /* _UAPI__LINUX_BTF_H__ */ |
| @@ -57,6 +57,8 @@ · 56 unmodified lines | ||
| 57 | 57 | #define CAN_ERR_BUSOFF 0x00000040U /* bus off */ |
| 58 | 58 | #define CAN_ERR_BUSERROR 0x00000080U /* bus error (may flood!) */ |
| 59 | 59 | #define CAN_ERR_RESTARTED 0x00000100U /* controller restarted */ |
| 60 | +#define CAN_ERR_CNT 0x00000200U /* TX error counter / data[6] */ | |
| 61 | + /* RX error counter / data[7] */ | |
| 60 | 62 | |
| 61 | 63 | /* arbitration lost in bit ... / data[0] */ |
| 62 | 64 | #define CAN_ERR_LOSTARB_UNSPEC 0x00 /* unspecified */ |
| @@ -120,6 +122,22 @@ · 57 unmodified lines | ||
| 120 | 122 | #define CAN_ERR_TRX_CANL_SHORT_TO_GND 0x70 /* 0111 0000 */ |
| 121 | 123 | #define CAN_ERR_TRX_CANL_SHORT_TO_CANH 0x80 /* 1000 0000 */ |
| 122 | 124 | |
| 123 | −/* controller specific additional information / data[5..7] */ | |
| 125 | +/* data[5] is reserved (do not use) */ | |
| 126 | + | |
| 127 | +/* TX error counter / data[6] */ | |
| 128 | +/* RX error counter / data[7] */ | |
| 129 | + | |
| 130 | +/* CAN state thresholds | |
| 131 | + * | |
| 132 | + * Error counter Error state | |
| 133 | + * ----------------------------------- | |
| 134 | + * 0 - 95 Error-active | |
| 135 | + * 96 - 127 Error-warning | |
| 136 | + * 128 - 255 Error-passive | |
| 137 | + * 256 and greater Bus-off | |
| 138 | + */ | |
| 139 | +#define CAN_ERROR_WARNING_THRESHOLD 96 | |
| 140 | +#define CAN_ERROR_PASSIVE_THRESHOLD 128 | |
| 141 | +#define CAN_BUS_OFF_THRESHOLD 256 | |
| 124 | 142 | |
| 125 | 143 | #endif /* _UAPI_CAN_ERROR_H */ |
| @@ -136,6 +136,9 @@ enum devlink_command { · 135 unmodified lines | ||
| 136 | 136 | DEVLINK_CMD_LINECARD_NEW, |
| 137 | 137 | DEVLINK_CMD_LINECARD_DEL, |
| 138 | 138 | |
| 139 | + DEVLINK_CMD_SELFTESTS_GET, /* can dump */ | |
| 140 | + DEVLINK_CMD_SELFTESTS_RUN, | |
| 141 | + | |
| 139 | 142 | /* add new commands above here */ |
| 140 | 143 | __DEVLINK_CMD_MAX, |
| 141 | 144 | DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1 |
| @@ -276,6 +279,30 @@ enum { · 134 unmodified lines | ||
| 276 | 279 | #define DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS \ |
| 277 | 280 | (_BITUL(__DEVLINK_FLASH_OVERWRITE_MAX_BIT) - 1) |
| 278 | 281 | |
| 282 | +enum devlink_attr_selftest_id { | |
| 283 | + DEVLINK_ATTR_SELFTEST_ID_UNSPEC, | |
| 284 | + DEVLINK_ATTR_SELFTEST_ID_FLASH, /* flag */ | |
| 285 | + | |
| 286 | + __DEVLINK_ATTR_SELFTEST_ID_MAX, | |
| 287 | + DEVLINK_ATTR_SELFTEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_ID_MAX - 1 | |
| 288 | +}; | |
| 289 | + | |
| 290 | +enum devlink_selftest_status { | |
| 291 | + DEVLINK_SELFTEST_STATUS_SKIP, | |
| 292 | + DEVLINK_SELFTEST_STATUS_PASS, | |
| 293 | + DEVLINK_SELFTEST_STATUS_FAIL | |
| 294 | +}; | |
| 295 | + | |
| 296 | +enum devlink_attr_selftest_result { | |
| 297 | + DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC, | |
| 298 | + DEVLINK_ATTR_SELFTEST_RESULT, /* nested */ | |
| 299 | + DEVLINK_ATTR_SELFTEST_RESULT_ID, /* u32, enum devlink_attr_selftest_id */ | |
| 300 | + DEVLINK_ATTR_SELFTEST_RESULT_STATUS, /* u8, enum devlink_selftest_status */ | |
| 301 | + | |
| 302 | + __DEVLINK_ATTR_SELFTEST_RESULT_MAX, | |
| 303 | + DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1 | |
| 304 | +}; | |
| 305 | + | |
| 279 | 306 | /** |
| 280 | 307 | * enum devlink_trap_action - Packet trap action. |
| 281 | 308 | * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not |
| @@ -576,6 +603,10 @@ enum devlink_attr { · 294 unmodified lines | ||
| 576 | 603 | DEVLINK_ATTR_LINECARD_TYPE, /* string */ |
| 577 | 604 | DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES, /* nested */ |
| 578 | 605 | |
| 606 | + DEVLINK_ATTR_NESTED_DEVLINK, /* nested */ | |
| 607 | + | |
| 608 | + DEVLINK_ATTR_SELFTESTS, /* nested */ | |
| 609 | + | |
| 579 | 610 | /* add new attributes above here, update the policy in devlink.c */ |
| 580 | 611 | |
| 581 | 612 | __DEVLINK_ATTR_MAX, |
| @@ -116,6 +116,7 @@ · 115 unmodified lines | ||
| 116 | 116 | #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 117 | 117 | #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 118 | 118 | #define ETH_P_DSA_8021Q 0xDADB /* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 119 | +#define ETH_P_DSA_A5PSW 0xE001 /* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */ | |
| 119 | 120 | #define ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */ |
| 120 | 121 | #define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 121 | 122 | |
| @@ -963,6 +963,7 @@ enum { · 962 unmodified lines | ||
| 963 | 963 | IFLA_BOND_SLAVE_AD_AGGREGATOR_ID, |
| 964 | 964 | IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE, |
| 965 | 965 | IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE, |
| 966 | + IFLA_BOND_SLAVE_PRIO, | |
| 966 | 967 | __IFLA_BOND_SLAVE_MAX, |
| 967 | 968 | }; |
| 968 | 969 | |
| @@ -154,6 +154,7 @@ enum { · 153 unmodified lines | ||
| 154 | 154 | NDTPA_QUEUE_LENBYTES, /* u32 */ |
| 155 | 155 | NDTPA_MCAST_REPROBES, /* u32 */ |
| 156 | 156 | NDTPA_PAD, |
| 157 | + NDTPA_INTERVAL_PROBE_TIME_MS, /* u64, msecs */ | |
| 157 | 158 | __NDTPA_MAX |
| 158 | 159 | }; |
| 159 | 160 | #define NDTPA_MAX (__NDTPA_MAX - 1) |
| @@ -323,6 +323,17 @@ · 322 unmodified lines | ||
| 323 | 323 | * Once the association is done, the driver cleans the FILS AAD data. |
| 324 | 324 | */ |
| 325 | 325 | |
| 326 | +/** | |
| 327 | + * DOC: Multi-Link Operation | |
| 328 | + * | |
| 329 | + * In Multi-Link Operation, a connection between to MLDs utilizes multiple | |
| 330 | + * links. To use this in nl80211, various commands and responses now need | |
| 331 | + * to or will include the new %NL80211_ATTR_MLO_LINKS attribute. | |
| 332 | + * Additionally, various commands that need to operate on a specific link | |
| 333 | + * now need to be given the %NL80211_ATTR_MLO_LINK_ID attribute, e.g. to | |
| 334 | + * use %NL80211_CMD_START_AP or similar functions. | |
| 335 | + */ | |
| 336 | + | |
| 326 | 337 | /** |
| 327 | 338 | * enum nl80211_commands - supported nl80211 commands |
| 328 | 339 | * |
| @@ -753,6 +764,13 @@ · 424 unmodified lines | ||
| 753 | 764 | * %NL80211_ATTR_CSA_C_OFFSETS_TX is an array of offsets to CSA |
| 754 | 765 | * counters which will be updated to the current value. This attribute |
| 755 | 766 | * is used during CSA period. |
| 767 | + * For TX on an MLD, the frequency can be omitted and the link ID be | |
| 768 | + * specified, or if transmitting to a known peer MLD (with MLD addresses | |
| 769 | + * in the frame) both can be omitted and the link will be selected by | |
| 770 | + * lower layers. | |
| 771 | + * For RX notification, %NL80211_ATTR_RX_HW_TIMESTAMP may be included to | |
| 772 | + * indicate the frame RX timestamp and %NL80211_ATTR_TX_HW_TIMESTAMP may | |
| 773 | + * be included to indicate the ack TX timestamp. | |
| 756 | 774 | * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this |
| 757 | 775 | * command may be used with the corresponding cookie to cancel the wait |
| 758 | 776 | * time if it is known that it is no longer necessary. This command is |
| @@ -763,7 +781,9 @@ · 4 unmodified lines | ||
| 763 | 781 | * transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies |
| 764 | 782 | * the TX command and %NL80211_ATTR_FRAME includes the contents of the |
| 765 | 783 | * frame. %NL80211_ATTR_ACK flag is included if the recipient acknowledged |
| 766 | − * the frame. | |
| 784 | + * the frame. %NL80211_ATTR_TX_HW_TIMESTAMP may be included to indicate the | |
| 785 | + * tx timestamp and %NL80211_ATTR_RX_HW_TIMESTAMP may be included to | |
| 786 | + * indicate the ack RX timestamp. | |
| 767 | 787 | * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for |
| 768 | 788 | * backward compatibility. |
| 769 | 789 | * |
| @@ -1108,6 +1128,12 @@ · 338 unmodified lines | ||
| 1108 | 1128 | * has been received. %NL80211_ATTR_FRAME is used to specify the |
| 1109 | 1129 | * frame contents. The frame is the raw EAPoL data, without ethernet or |
| 1110 | 1130 | * 802.11 headers. |
| 1131 | + * For an MLD transmitter, the %NL80211_ATTR_MLO_LINK_ID may be given and | |
| 1132 | + * its effect will depend on the destination: If the destination is known | |
| 1133 | + * to be an MLD, this will be used as a hint to select the link to transmit | |
| 1134 | + * the frame on. If the destination is not an MLD, this will select both | |
| 1135 | + * the link to transmit on and the source address will be set to the link | |
| 1136 | + * address of that link. | |
| 1111 | 1137 | * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, |
| 1112 | 1138 | * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added |
| 1113 | 1139 | * indicating the protocol type of the received frame; whether the frame |
| @@ -1237,6 +1263,16 @@ · 123 unmodified lines | ||
| 1237 | 1263 | * to describe the BSSID address of the AP and %NL80211_ATTR_TIMEOUT to |
| 1238 | 1264 | * specify the timeout value. |
| 1239 | 1265 | * |
| 1266 | + * @NL80211_CMD_ADD_LINK: Add a new link to an interface. The | |
| 1267 | + * %NL80211_ATTR_MLO_LINK_ID attribute is used for the new link. | |
| 1268 | + * @NL80211_CMD_REMOVE_LINK: Remove a link from an interface. This may come | |
| 1269 | + * without %NL80211_ATTR_MLO_LINK_ID as an easy way to remove all links | |
| 1270 | + * in preparation for e.g. roaming to a regular (non-MLO) AP. | |
| 1271 | + * | |
| 1272 | + * @NL80211_CMD_ADD_LINK_STA: Add a link to an MLD station | |
| 1273 | + * @NL80211_CMD_MODIFY_LINK_STA: Modify a link of an MLD station | |
| 1274 | + * @NL80211_CMD_REMOVE_LINK_STA: Remove a link of an MLD station | |
| 1275 | + * | |
| 1240 | 1276 | * @NL80211_CMD_MAX: highest used command number |
| 1241 | 1277 | * @__NL80211_CMD_AFTER_LAST: internal use |
| 1242 | 1278 | */ |
| @@ -1481,6 +1517,13 @@ enum nl80211_commands { · 238 unmodified lines | ||
| 1481 | 1517 | |
| 1482 | 1518 | NL80211_CMD_ASSOC_COMEBACK, |
| 1483 | 1519 | |
| 1520 | + NL80211_CMD_ADD_LINK, | |
| 1521 | + NL80211_CMD_REMOVE_LINK, | |
| 1522 | + | |
| 1523 | + NL80211_CMD_ADD_LINK_STA, | |
| 1524 | + NL80211_CMD_MODIFY_LINK_STA, | |
| 1525 | + NL80211_CMD_REMOVE_LINK_STA, | |
| 1526 | + | |
| 1484 | 1527 | /* add new commands above here */ |
| 1485 | 1528 | |
| 1486 | 1529 | /* used to define NL80211_CMD_MAX below */ |
| @@ -2340,8 +2383,10 @@ enum nl80211_commands { · 853 unmodified lines | ||
| 2340 | 2383 | * |
| 2341 | 2384 | * @NL80211_ATTR_IFTYPE_EXT_CAPA: Nested attribute of the following attributes: |
| 2342 | 2385 | * %NL80211_ATTR_IFTYPE, %NL80211_ATTR_EXT_CAPA, |
| 2343 | − * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per | |
| 2344 | − * interface type. | |
| 2386 | + * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities and | |
| 2387 | + * other interface-type specific capabilities per interface type. For MLO, | |
| 2388 | + * %NL80211_ATTR_EML_CAPABILITY and %NL80211_ATTR_MLD_CAPA_AND_OPS are | |
| 2389 | + * present. | |
| 2345 | 2390 | * |
| 2346 | 2391 | * @NL80211_ATTR_MU_MIMO_GROUP_DATA: array of 24 bytes that defines a MU-MIMO |
| 2347 | 2392 | * groupID for monitor mode. |
| @@ -2663,6 +2708,39 @@ enum nl80211_commands { · 315 unmodified lines | ||
| 2663 | 2708 | * association request when used with NL80211_CMD_NEW_STATION). Can be set |
| 2664 | 2709 | * only if %NL80211_STA_FLAG_WME is set. |
| 2665 | 2710 | * |
| 2711 | + * @NL80211_ATTR_MLO_LINK_ID: A (u8) link ID for use with MLO, to be used with | |
| 2712 | + * various commands that need a link ID to operate. | |
| 2713 | + * @NL80211_ATTR_MLO_LINKS: A nested array of links, each containing some | |
| 2714 | + * per-link information and a link ID. | |
| 2715 | + * @NL80211_ATTR_MLD_ADDR: An MLD address, used with various commands such as | |
| 2716 | + * authenticate/associate. | |
| 2717 | + * | |
| 2718 | + * @NL80211_ATTR_MLO_SUPPORT: Flag attribute to indicate user space supports MLO | |
| 2719 | + * connection. Used with %NL80211_CMD_CONNECT. If this attribute is not | |
| 2720 | + * included in NL80211_CMD_CONNECT drivers must not perform MLO connection. | |
| 2721 | + * | |
| 2722 | + * @NL80211_ATTR_MAX_NUM_AKM_SUITES: U16 attribute. Indicates maximum number of | |
| 2723 | + * AKM suites allowed for %NL80211_CMD_CONNECT, %NL80211_CMD_ASSOCIATE and | |
| 2724 | + * %NL80211_CMD_START_AP in %NL80211_CMD_GET_WIPHY response. If this | |
| 2725 | + * attribute is not present userspace shall consider maximum number of AKM | |
| 2726 | + * suites allowed as %NL80211_MAX_NR_AKM_SUITES which is the legacy maximum | |
| 2727 | + * number prior to the introduction of this attribute. | |
| 2728 | + * | |
| 2729 | + * @NL80211_ATTR_EML_CAPABILITY: EML Capability information (u16) | |
| 2730 | + * @NL80211_ATTR_MLD_CAPA_AND_OPS: MLD Capabilities and Operations (u16) | |
| 2731 | + * | |
| 2732 | + * @NL80211_ATTR_TX_HW_TIMESTAMP: Hardware timestamp for TX operation in | |
| 2733 | + * nanoseconds (u64). This is the device clock timestamp so it will | |
| 2734 | + * probably reset when the device is stopped or the firmware is reset. | |
| 2735 | + * When used with %NL80211_CMD_FRAME_TX_STATUS, indicates the frame TX | |
| 2736 | + * timestamp. When used with %NL80211_CMD_FRAME RX notification, indicates | |
| 2737 | + * the ack TX timestamp. | |
| 2738 | + * @NL80211_ATTR_RX_HW_TIMESTAMP: Hardware timestamp for RX operation in | |
| 2739 | + * nanoseconds (u64). This is the device clock timestamp so it will | |
| 2740 | + * probably reset when the device is stopped or the firmware is reset. | |
| 2741 | + * When used with %NL80211_CMD_FRAME_TX_STATUS, indicates the ack RX | |
| 2742 | + * timestamp. When used with %NL80211_CMD_FRAME RX notification, indicates | |
| 2743 | + * the incoming frame RX timestamp. | |
| 2666 | 2744 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 2667 | 2745 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 2668 | 2746 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -3177,6 +3255,20 @@ enum nl80211_attrs { · 508 unmodified lines | ||
| 3177 | 3255 | |
| 3178 | 3256 | NL80211_ATTR_DISABLE_EHT, |
| 3179 | 3257 | |
| 3258 | + NL80211_ATTR_MLO_LINKS, | |
| 3259 | + NL80211_ATTR_MLO_LINK_ID, | |
| 3260 | + NL80211_ATTR_MLD_ADDR, | |
| 3261 | + | |
| 3262 | + NL80211_ATTR_MLO_SUPPORT, | |
| 3263 | + | |
| 3264 | + NL80211_ATTR_MAX_NUM_AKM_SUITES, | |
| 3265 | + | |
| 3266 | + NL80211_ATTR_EML_CAPABILITY, | |
| 3267 | + NL80211_ATTR_MLD_CAPA_AND_OPS, | |
| 3268 | + | |
| 3269 | + NL80211_ATTR_TX_HW_TIMESTAMP, | |
| 3270 | + NL80211_ATTR_RX_HW_TIMESTAMP, | |
| 3271 | + | |
| 3180 | 3272 | /* add attributes here, update the policy in nl80211.c */ |
| 3181 | 3273 | |
| 3182 | 3274 | __NL80211_ATTR_AFTER_LAST, |
| @@ -3231,6 +3323,11 @@ enum nl80211_attrs { · 48 unmodified lines | ||
| 3231 | 3323 | #define NL80211_HE_MIN_CAPABILITY_LEN 16 |
| 3232 | 3324 | #define NL80211_HE_MAX_CAPABILITY_LEN 54 |
| 3233 | 3325 | #define NL80211_MAX_NR_CIPHER_SUITES 5 |
| 3326 | + | |
| 3327 | +/* | |
| 3328 | + * NL80211_MAX_NR_AKM_SUITES is obsolete when %NL80211_ATTR_MAX_NUM_AKM_SUITES | |
| 3329 | + * present in %NL80211_CMD_GET_WIPHY response. | |
| 3330 | + */ | |
| 3234 | 3331 | #define NL80211_MAX_NR_AKM_SUITES 2 |
| 3235 | 3332 | #define NL80211_EHT_MIN_CAPABILITY_LEN 13 |
| 3236 | 3333 | #define NL80211_EHT_MAX_CAPABILITY_LEN 51 |
| @@ -4853,6 +4950,7 @@ enum nl80211_bss_scan_width { · 1616 unmodified lines | ||
| 4853 | 4950 | * Contains a nested array of signal strength attributes (u8, dBm), |
| 4854 | 4951 | * using the nesting index as the antenna number. |
| 4855 | 4952 | * @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz |
| 4953 | + * @NL80211_BSS_MLO_LINK_ID: MLO link ID of the BSS (u8). | |
| 4856 | 4954 | * @__NL80211_BSS_AFTER_LAST: internal |
| 4857 | 4955 | * @NL80211_BSS_MAX: highest BSS attribute |
| 4858 | 4956 | */ |
| @@ -4878,6 +4976,7 @@ enum nl80211_bss { · 19 unmodified lines | ||
| 4878 | 4976 | NL80211_BSS_PARENT_BSSID, |
| 4879 | 4977 | NL80211_BSS_CHAIN_SIGNAL, |
| 4880 | 4978 | NL80211_BSS_FREQUENCY_OFFSET, |
| 4979 | + NL80211_BSS_MLO_LINK_ID, | |
| 4881 | 4980 | |
| 4882 | 4981 | /* keep last */ |
| 4883 | 4982 | __NL80211_BSS_AFTER_LAST, |
| @@ -5874,7 +5973,7 @@ enum nl80211_ap_sme_features { · 990 unmodified lines | ||
| 5874 | 5973 | * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up |
| 5875 | 5974 | * the connected inactive stations in AP mode. |
| 5876 | 5975 | * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested |
| 5877 | − * to work properly to suppport receiving regulatory hints from | |
| 5976 | + * to work properly to support receiving regulatory hints from | |
| 5878 | 5977 | * cellular base stations. |
| 5879 | 5978 | * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only |
| 5880 | 5979 | * here to reserve the value for API/ABI compatibility) |
| @@ -589,6 +589,9 @@ enum { · 588 unmodified lines | ||
| 589 | 589 | |
| 590 | 590 | TCA_FLOWER_KEY_NUM_OF_VLANS, /* u8 */ |
| 591 | 591 | |
| 592 | + TCA_FLOWER_KEY_PPPOE_SID, /* be16 */ | |
| 593 | + TCA_FLOWER_KEY_PPP_PROTO, /* be16 */ | |
| 594 | + | |
| 592 | 595 | __TCA_FLOWER_MAX, |
| 593 | 596 | }; |
| 594 | 597 | |
| @@ -35,6 +35,8 @@ enum { · 34 unmodified lines | ||
| 35 | 35 | SEG6_IPTUN_MODE_INLINE, |
| 36 | 36 | SEG6_IPTUN_MODE_ENCAP, |
| 37 | 37 | SEG6_IPTUN_MODE_L2ENCAP, |
| 38 | + SEG6_IPTUN_MODE_ENCAP_RED, | |
| 39 | + SEG6_IPTUN_MODE_L2ENCAP_RED, | |
| 38 | 40 | }; |
| 39 | 41 | |
| 40 | 42 | #endif |
| @@ -124,6 +124,7 @@ enum { · 123 unmodified lines | ||
| 124 | 124 | SMC_NLA_LGR_R_V2, /* nest */ |
| 125 | 125 | SMC_NLA_LGR_R_NET_COOKIE, /* u64 */ |
| 126 | 126 | SMC_NLA_LGR_R_PAD, /* flag */ |
| 127 | + SMC_NLA_LGR_R_BUF_TYPE, /* u8 */ | |
| 127 | 128 | __SMC_NLA_LGR_R_MAX, |
| 128 | 129 | SMC_NLA_LGR_R_MAX = __SMC_NLA_LGR_R_MAX - 1 |
| 129 | 130 | }; |
| @@ -344,6 +344,8 @@ enum · 343 unmodified lines | ||
| 344 | 344 | LINUX_MIB_TLSRXDEVICE, /* TlsRxDevice */ |
| 345 | 345 | LINUX_MIB_TLSDECRYPTERROR, /* TlsDecryptError */ |
| 346 | 346 | LINUX_MIB_TLSRXDEVICERESYNC, /* TlsRxDeviceResync */ |
| 347 | + LINUX_MIB_TLSDECRYPTRETRY, /* TlsDecryptRetry */ | |
| 348 | + LINUX_MIB_TLSRXNOPADVIOL, /* TlsRxNoPadViolation */ | |
| 347 | 349 | __LINUX_MIB_TLSMAX |
| 348 | 350 | }; |
| 349 | 351 | |
| @@ -584,24 +584,25 @@ enum { · 583 unmodified lines | ||
| 584 | 584 | |
| 585 | 585 | /* /proc/sys/net/<protocol>/neigh/<dev> */ |
| 586 | 586 | enum { |
| 587 | − NET_NEIGH_MCAST_SOLICIT=1, | |
| 588 | − NET_NEIGH_UCAST_SOLICIT=2, | |
| 589 | − NET_NEIGH_APP_SOLICIT=3, | |
| 590 | − NET_NEIGH_RETRANS_TIME=4, | |
| 591 | − NET_NEIGH_REACHABLE_TIME=5, | |
| 592 | − NET_NEIGH_DELAY_PROBE_TIME=6, | |
| 593 | − NET_NEIGH_GC_STALE_TIME=7, | |
| 594 | − NET_NEIGH_UNRES_QLEN=8, | |
| 595 | − NET_NEIGH_PROXY_QLEN=9, | |
| 596 | − NET_NEIGH_ANYCAST_DELAY=10, | |
| 597 | − NET_NEIGH_PROXY_DELAY=11, | |
| 598 | − NET_NEIGH_LOCKTIME=12, | |
| 599 | − NET_NEIGH_GC_INTERVAL=13, | |
| 600 | − NET_NEIGH_GC_THRESH1=14, | |
| 601 | − NET_NEIGH_GC_THRESH2=15, | |
| 602 | − NET_NEIGH_GC_THRESH3=16, | |
| 603 | − NET_NEIGH_RETRANS_TIME_MS=17, | |
| 604 | − NET_NEIGH_REACHABLE_TIME_MS=18, | |
| 587 | + NET_NEIGH_MCAST_SOLICIT = 1, | |
| 588 | + NET_NEIGH_UCAST_SOLICIT = 2, | |
| 589 | + NET_NEIGH_APP_SOLICIT = 3, | |
| 590 | + NET_NEIGH_RETRANS_TIME = 4, | |
| 591 | + NET_NEIGH_REACHABLE_TIME = 5, | |
| 592 | + NET_NEIGH_DELAY_PROBE_TIME = 6, | |
| 593 | + NET_NEIGH_GC_STALE_TIME = 7, | |
| 594 | + NET_NEIGH_UNRES_QLEN = 8, | |
| 595 | + NET_NEIGH_PROXY_QLEN = 9, | |
| 596 | + NET_NEIGH_ANYCAST_DELAY = 10, | |
| 597 | + NET_NEIGH_PROXY_DELAY = 11, | |
| 598 | + NET_NEIGH_LOCKTIME = 12, | |
| 599 | + NET_NEIGH_GC_INTERVAL = 13, | |
| 600 | + NET_NEIGH_GC_THRESH1 = 14, | |
| 601 | + NET_NEIGH_GC_THRESH2 = 15, | |
| 602 | + NET_NEIGH_GC_THRESH3 = 16, | |
| 603 | + NET_NEIGH_RETRANS_TIME_MS = 17, | |
| 604 | + NET_NEIGH_REACHABLE_TIME_MS = 18, | |
| 605 | + NET_NEIGH_INTERVAL_PROBE_TIME_MS = 19, | |
| 605 | 606 | }; |
| 606 | 607 | |
| 607 | 608 | /* /proc/sys/net/dccp */ |
| @@ -40,6 +40,7 @@ · 39 unmodified lines | ||
| 40 | 40 | #define TLS_TX 1 /* Set transmit parameters */ |
| 41 | 41 | #define TLS_RX 2 /* Set receive parameters */ |
| 42 | 42 | #define TLS_TX_ZEROCOPY_RO 3 /* TX zerocopy (only sendfile now) */ |
| 43 | +#define TLS_RX_EXPECT_NO_PAD 4 /* Attempt opportunistic zero-copy */ | |
| 43 | 44 | |
| 44 | 45 | /* Supported versions */ |
| 45 | 46 | #define TLS_VERSION_MINOR(ver) ((ver) & 0xFF) |
| @@ -162,6 +163,7 @@ enum { · 116 unmodified lines | ||
| 162 | 163 | TLS_INFO_TXCONF, |
| 163 | 164 | TLS_INFO_RXCONF, |
| 164 | 165 | TLS_INFO_ZC_RO_TX, |
| 166 | + TLS_INFO_RX_NO_PAD, | |
| 165 | 167 | __TLS_INFO_MAX, |
| 166 | 168 | }; |
| 167 | 169 | #define TLS_INFO_MAX (__TLS_INFO_MAX - 1) |
| @@ -511,9 +511,9 @@ struct xfrm_user_offload { · 510 unmodified lines | ||
| 511 | 511 | int ifindex; |
| 512 | 512 | __u8 flags; |
| 513 | 513 | }; |
| 514 | −/* This flag was exposed without any kernel code that supporting it. | |
| 515 | − * Unfortunately, strongswan has the code that uses sets this flag, | |
| 516 | − * which makes impossible to reuse this bit. | |
| 514 | +/* This flag was exposed without any kernel code that supports it. | |
| 515 | + * Unfortunately, strongswan has the code that sets this flag, | |
| 516 | + * which makes it impossible to reuse this bit. | |
| 517 | 517 | * |
| 518 | 518 | * So leave it here to make sure that it won't be reused by mistake. |
| 519 | 519 | */ |
| @@ -63,6 +63,7 @@ enum mlx5_ib_uapi_dm_type { · 62 unmodified lines | ||
| 63 | 63 | MLX5_IB_UAPI_DM_TYPE_MEMIC, |
| 64 | 64 | MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM, |
| 65 | 65 | MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM, |
| 66 | + MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM, | |
| 66 | 67 | }; |
| 67 | 68 | |
| 68 | 69 | enum mlx5_ib_uapi_devx_create_event_channel_flags { |