The branch stable/14 has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4425d92a8044a82b8eac48b3131802d96aaf91f2
commit 4425d92a8044a82b8eac48b3131802d96aaf91f2
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2024-11-19 15:25:49 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-12-27 15:30:05 +0000
socket: Move SO_SPLICE next to other socket option constants
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D47626
(cherry picked from commit 48a88a4ee95a725a435a817401ea4c0d9c990cd1)
---
sys/sys/socket.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 22b764b07c2b..65b5c5ee001d 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -173,10 +173,10 @@ typedef __uintptr_t uintptr_t;
#define SO_TS_CLOCK 0x1017 /* clock type used for
SO_TIMESTAMP */
#define SO_MAX_PACING_RATE 0x1018 /* socket's max TX pacing rate
(Linux name) */
#define SO_DOMAIN 0x1019 /* get socket domain */
+#define SO_SPLICE 0x1023 /* splice data to other socket
*/
#endif
#if __BSD_VISIBLE
-#define SO_SPLICE 0x1023 /* splice data to other socket
*/
#define SO_TS_REALTIME_MICRO 0 /* microsecond resolution,
realtime */
#define SO_TS_BINTIME 1 /* sub-nanosecond resolution,
realtime */
#define SO_TS_REALTIME 2 /* nanosecond resolution,
realtime */
