]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Update kernel headers
authorDavid Ahern <dsahern@kernel.org>
Sun, 12 Jun 2022 15:43:54 +0000 (09:43 -0600)
committerDavid Ahern <dsahern@kernel.org>
Sun, 12 Jun 2022 15:43:54 +0000 (09:43 -0600)
Update kernel headers to commit:
    27f2533bcc6e ("nfp: flower: support to offload pedit of IPv6 flowinto fields")

Signed-off-by: David Ahern <dsahern@kernel.org>
include/uapi/linux/elf-em.h
include/uapi/linux/socket.h
include/uapi/linux/tls.h

index f47e853546faa94bf520b7ce6d76c1edaec800c6..ef38c2bc5ab7a58ba03d309654051b25a2ac2933 100644 (file)
@@ -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 */
 
 /*
index d05a2170b56358fc9a5ebae46812f3f9ca6d1c68..89c227f3d4cdca32763351f2e3369b52f2c7481c 100644 (file)
@@ -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
 
index 83a3cea46cece93c15752fd89cc85c72b33811e6..15a628235873fb610d0ed4b9e9d17b084670cd7b 100644 (file)
@@ -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)