Skip to content

Commit 23b7633

Browse files
mihalicynPaolo Abeni
authored andcommitted
tools headers: Sync uapi/asm-generic/socket.h with the kernel sources
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: a89568e ("selftests: txtimestamp: add SCM_TS_OPT_ID test") Fixes: e45469e ("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>
1 parent 2c1f97a commit 23b7633

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

tools/include/uapi/asm-generic/socket.h

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,31 @@
119119

120120
#define SO_DETACH_REUSEPORT_BPF 68
121121

122+
#define SO_PREFER_BUSY_POLL 69
123+
#define SO_BUSY_POLL_BUDGET 70
124+
125+
#define SO_NETNS_COOKIE 71
126+
127+
#define SO_BUF_LOCK 72
128+
129+
#define SO_RESERVE_MEM 73
130+
131+
#define SO_TXREHASH 74
132+
122133
#define SO_RCVMARK 75
123134

124135
#define SO_PASSPIDFD 76
125136
#define SO_PEERPIDFD 77
126137

127-
#define SCM_TS_OPT_ID 78
138+
#define SO_DEVMEM_LINEAR 78
139+
#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR
140+
#define SO_DEVMEM_DMABUF 79
141+
#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF
142+
#define SO_DEVMEM_DONTNEED 80
143+
144+
#define SCM_TS_OPT_ID 81
128145

129-
#define SO_RCVPRIORITY 79
146+
#define SO_RCVPRIORITY 82
130147

131148
#if !defined(__KERNEL__)
132149

0 commit comments

Comments
 (0)