]> www.infradead.org Git - users/hch/misc.git/commitdiff
tools headers: Sync uapi/asm-generic/socket.h with the kernel sources
authorAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Fri, 14 Mar 2025 21:41:54 +0000 (22:41 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 20 Mar 2025 14:14:46 +0000 (15:14 +0100)
This also fixes a wrong definitions for SCM_TS_OPT_ID & SO_RCVPRIORITY.

Accidentally found while working on another patchset.

Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Jason Xing <kerneljasonxing@gmail.com>
Cc: Anna Emese Nyiri <annaemesenyiri@gmail.com>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Fixes: a89568e9be75 ("selftests: txtimestamp: add SCM_TS_OPT_ID test")
Fixes: e45469e594b2 ("sock: Introduce SO_RCVPRIORITY socket option")
Link: https://lore.kernel.org/netdev/20250314195257.34854-1-kuniyu@amazon.com/
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
Link: https://patch.msgid.link/20250314214155.16046-1-aleksandr.mikhalitsyn@canonical.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
tools/include/uapi/asm-generic/socket.h

index ffff554a52300da1e969b5a066ea47ac8ae30be4..aa5016ff3d9115cfc99cad48f7e4f5828d1a34d4 100644 (file)
 
 #define SO_DETACH_REUSEPORT_BPF 68
 
+#define SO_PREFER_BUSY_POLL    69
+#define SO_BUSY_POLL_BUDGET    70
+
+#define SO_NETNS_COOKIE                71
+
+#define SO_BUF_LOCK            72
+
+#define SO_RESERVE_MEM         73
+
+#define SO_TXREHASH            74
+
 #define SO_RCVMARK             75
 
 #define SO_PASSPIDFD           76
 #define SO_PEERPIDFD           77
 
-#define SCM_TS_OPT_ID          78
+#define SO_DEVMEM_LINEAR       78
+#define SCM_DEVMEM_LINEAR      SO_DEVMEM_LINEAR
+#define SO_DEVMEM_DMABUF       79
+#define SCM_DEVMEM_DMABUF      SO_DEVMEM_DMABUF
+#define SO_DEVMEM_DONTNEED     80
+
+#define SCM_TS_OPT_ID          81
 
-#define SO_RCVPRIORITY         79
+#define SO_RCVPRIORITY         82
 
 #if !defined(__KERNEL__)