From nobody Sat May 28 20:53:20 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D56771B47FAB; Sat, 28 May 2022 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L9YmK2lc7z4l6s; Sat, 28 May 2022 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653771201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ncb5k+biUxkjH9zLswH16zQ5c4/9GPzORLwOpa2miY=; b=GoVUvuNQIsjoCiyKl6TdDDXTJJc+1IOGlNS6qZDWgH97+ZUvoouHLQwsOgntxxVAyMvKfh rjjqwIgj+8RINNUonVY2Vnv2M/XBtWoR5jdve4JXazRvJrlOLPDkTUQoCPjLzSyP1XTuav MxyM2cCDSqoF2lP7+p1se/Z+skLIjOxFKUhQA221HG4AcUNV/7A+KmRRPYYff/spYegrx8 BuQaJMKUfaecGc4meoNo9ffDwCb3KnIdr6zbqgX9y232B0HchEeh8h10HXgWXYphptobbg BXKioT16AHB8CXMud/Vz2K7XcsDsSILkvuEW11TeC0Gl4m11i8Ma3G//kkdWxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB39116040; Sat, 28 May 2022 20:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24SKrK6i099336; Sat, 28 May 2022 20:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SKrKBj099335; Sat, 28 May 2022 20:53:20 GMT (envelope-from git) Date: Sat, 28 May 2022 20:53:20 GMT Message-Id: <202205282053.24SKrKBj099335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: f409a7c5386a - main - linux(4): For future use move SCM definitions below socket options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f409a7c5386a30edccf2b26a5612cab99fdff045 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653771201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ncb5k+biUxkjH9zLswH16zQ5c4/9GPzORLwOpa2miY=; b=MeY1iCjwl7ISTx6yghUgmfc5LwhD066iaeS1FR8MqG77m9eelgrDRFEH4nZh0zJB3bMaxx iSvjWq9NkLdD70wMw7ckg1v2ntM+zNb9u2tKefhGCZ48lkvnNkeKSDYtfHy8M9PmxRh6yg qP6ivFDIf8pvWbD8mMtlfVBkYZ31/plMwE+AMbTqROuJtpX4UGkLj6N6Ds4YJud/FnYatu EU7J+8noSl1DsIA2VgYPma/+sOs29qjZmwE4qerdRfw66O82wCHfen4WwSSjmke1vvoLEK CZD0PMVOJ4qln0v1TCJSBXHv1QNiH/KdftHwIsQPVQj0ZhSAIZx63r5O+H5GIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653771201; a=rsa-sha256; cv=none; b=ijWPit91tqKIYMmCMQNhgs9so6fyA5C61CUynxZWeokDrcMblg8sE634Olurnq5+fdBiMy iReCsZPJFepXqzm6n6qlK4RimtfOTlIAmky3U5Cq44bJUwcP+Q6holFZ0nksMT2mdps5OQ 6ahEaP3z8RsqzWQ755EvVrS39UUjkWHWf9ZvV2PEfRN3jrvZQCjBJ1re0X0aaBP2wQlP8v 0lnM90xSztY7P0fPl3KKTc7jHIY4sM326NIeruVjM7fPIfEMrpRFnt/YPNjGpQdPPhPezd ekgFmTLTejFGFhfjuM1hzQq3G7v1+nUOXl95LdJLufAWiFkTz8hvpMjsWVmY7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f409a7c5386a30edccf2b26a5612cab99fdff045 commit f409a7c5386a30edccf2b26a5612cab99fdff045 Author: Dmitry Chagin AuthorDate: 2022-05-28 20:42:23 +0000 Commit: Dmitry Chagin 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