The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f409a7c5386a30edccf2b26a5612cab99fdff045
commit f409a7c5386a30edccf2b26a5612cab99fdff045
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2022-05-28 20:42:23 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2022-05-28 20:42:23 +0000
linux(4): For future use move SCM definitions below socket options
MFC after: 2 weeks
---
sys/compat/linux/linux_socket.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index 4decb24236bb..33f54ffcf634 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.h
@@ -53,12 +53,6 @@
#define LINUX_MSG_WAITFORONE 0x10000
#define LINUX_MSG_CMSG_CLOEXEC 0x40000000
-/* Socket-level control message types */
-
-#define LINUX_SCM_RIGHTS 0x01
-#define LINUX_SCM_CREDENTIALS 0x02
-#define LINUX_SCM_TIMESTAMP 0x1D
-
struct l_msghdr {
l_uintptr_t msg_name;
l_int msg_namelen;
@@ -202,6 +196,12 @@ int linux_accept(struct thread *td, struct
linux_accept_args *args);
#define LINUX_SO_DOMAIN 39
#define LINUX_SO_PEERGROUPS 59
+/* Socket-level control message types */
+
+#define LINUX_SCM_RIGHTS 0x01
+#define LINUX_SCM_CREDENTIALS 0x02
+#define LINUX_SCM_TIMESTAMP LINUX_SO_TIMESTAMP
+
/* Socket options */
#define LINUX_IP_TOS 1
#define LINUX_IP_TTL 2
