diff options
| author | David Ahern <dsahern@kernel.org> | 2022-06-12 09:43:54 -0600 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-06-12 09:43:54 -0600 |
| commit | 266d0f854a50d31e188752965ec7c767818f55c4 (patch) | |
| tree | cb87db3f384e6ff55240c78dbe130dd407c9945e | |
| parent | f84e3f8cced949e7d81cba1e67e1a6d3ec92d317 (diff) | |
| download | iproute2-266d0f854a50d31e188752965ec7c767818f55c4.tar.gz | |
Update kernel headers
Update kernel headers to commit:
27f2533bcc6e ("nfp: flower: support to offload pedit of IPv6 flowinto fields")
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | include/uapi/linux/elf-em.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/socket.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/tls.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h index f47e85354..ef38c2bc5 100644 --- a/include/uapi/linux/elf-em.h +++ b/include/uapi/linux/elf-em.h @@ -51,6 +51,7 @@ #define EM_RISCV 243 /* RISC-V */ #define EM_BPF 247 /* Linux BPF - in-kernel virtual machine */ #define EM_CSKY 252 /* C-SKY */ +#define EM_LOONGARCH 258 /* LoongArch */ #define EM_FRV 0x5441 /* Fujitsu FR-V */ /* diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h index d05a2170b..89c227f3d 100644 --- a/include/uapi/linux/socket.h +++ b/include/uapi/linux/socket.h @@ -31,7 +31,7 @@ struct __kernel_sockaddr_storage { #define SOCK_BUF_LOCK_MASK (SOCK_SNDBUF_LOCK | SOCK_RCVBUF_LOCK) -#define SOCK_TXREHASH_DEFAULT ((u8)-1) +#define SOCK_TXREHASH_DEFAULT 255 #define SOCK_TXREHASH_DISABLED 0 #define SOCK_TXREHASH_ENABLED 1 diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h index 83a3cea46..15a628235 100644 --- a/include/uapi/linux/tls.h +++ b/include/uapi/linux/tls.h @@ -39,7 +39,7 @@ /* TLS socket options */ #define TLS_TX 1 /* Set transmit parameters */ #define TLS_RX 2 /* Set receive parameters */ -#define TLS_TX_ZEROCOPY_SENDFILE 3 /* transmit zerocopy sendfile */ +#define TLS_TX_ZEROCOPY_RO 3 /* TX zerocopy (only sendfile now) */ /* Supported versions */ #define TLS_VERSION_MINOR(ver) ((ver) & 0xFF) @@ -161,7 +161,7 @@ enum { TLS_INFO_CIPHER, TLS_INFO_TXCONF, TLS_INFO_RXCONF, - TLS_INFO_ZC_SENDFILE, + TLS_INFO_ZC_RO_TX, __TLS_INFO_MAX, }; #define TLS_INFO_MAX (__TLS_INFO_MAX - 1) |