The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=48a88a4ee95a725a435a817401ea4c0d9c990cd1

commit 48a88a4ee95a725a435a817401ea4c0d9c990cd1
Author:     John Baldwin <[email protected]>
AuthorDate: 2024-11-19 15:25:49 +0000
Commit:     John Baldwin <[email protected]>
CommitDate: 2024-11-19 15:25:49 +0000

    socket: Move SO_SPLICE next to other socket option constants
    
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D47626
---
 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 a1b220ce4bae..cc82d97e9dd5 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -171,10 +171,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 */

Reply via email to