Skip to content

Commit f19972e

Browse files
committed
tools headers: Sync uapi/asm-generic/socket.h with the kernel sources
JIRA: https://issues.redhat.com/browse/RHEL-77936 upstream ======== commit 23b7633 Author: Alexander Mikhalitsyn <[email protected]> Date: Fri Mar 14 22:41:54 2025 +0100 description =========== This also fixes a wrong definitions for SCM_TS_OPT_ID & SO_RCVPRIORITY. Accidentally found while working on another patchset. Cc: [email protected] Cc: [email protected] Cc: Eric Dumazet <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Vadim Fedorenko <[email protected]> Cc: Willem de Bruijn <[email protected]> Cc: Jason Xing <[email protected]> Cc: Anna Emese Nyiri <[email protected]> Cc: Kuniyuki Iwashima <[email protected]> Cc: Paolo Abeni <[email protected]> Fixes: a89568e ("selftests: txtimestamp: add SCM_TS_OPT_ID test") Fixes: e45469e ("sock: Introduce SO_RCVPRIORITY socket option") Link: https://lore.kernel.org/netdev/[email protected]/ Reviewed-by: Kuniyuki Iwashima <[email protected]> Signed-off-by: Alexander Mikhalitsyn <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Reviewed-by: Jason Xing <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Conflicts: ========== The patch do not match exactly, but it does not matter in this case. We cannot exactly follow upstream changes in the tools' copy of linux headers, since we don't usually take all the changes they react to. Since the tools' headers updates usually come in batches and squash several linux commits in one. So in order to keep them synced, it's needed to update them manually by RHEL-only commits around the end of RHEL minor development phase right against their downstream counter- parts. Signed-off-by: Michael Petlan <[email protected]>
1 parent a534ed3 commit f19972e

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,32 @@
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

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
145+
146+
#define SO_RCVPRIORITY 82
147+
127148
#if !defined(__KERNEL__)
128149

129150
#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))

0 commit comments

Comments
 (0)