Date: Fri, 17 Jun 2022 19:41:10 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 24f2f93f5e24 - stable/13 - linux(4): For future use move SCM definitions below socket options Message-ID: <202206171941.25HJfAkB030136@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=24f2f93f5e241a1e53783602ba195c8144416511 commit 24f2f93f5e241a1e53783602ba195c8144416511 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-28 20:42:23 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:35:33 +0000 linux(4): For future use move SCM definitions below socket options MFC after: 2 weeks (cherry picked from commit f409a7c5386a30edccf2b26a5612cab99fdff045) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171941.25HJfAkB030136>