From nobody Fri Jun 17 19:41:10 2022 X-Original-To: dev-commits-src-branches@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 3228785D7D6; Fri, 17 Jun 2022 19:41:12 +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 4LPqCq5WWGz3jHT; Fri, 17 Jun 2022 19:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494872; 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=zsaAYCr4EDyqfXD6v8jUaAjVcLmnHDSKcgAnvIMOY+w=; b=IlTNnwDyoVFT1rgZG7ejm45GewAwzC1m99CdK47lhkzF34J8GXmSiUOtpeiEuCpzTqR11c hLA03Jfi5ZbGbj0Wij9VsEnWN8p8fEceHSBDSTpII5a3TzWgnx5P8GvggI8BjVgKCIuAv+ bOnMDXgJO5AP2WoD8zqSPsscVDmsEgCGjxJaKK+sPq0Q1+X7tLp+df+EK0keXilZ1kDv35 MM1tzcRLTz3MFmrg0Gc0uy2oXtTY1Sz4wfZLkJHI+x2Ov/sZwYyfzS4ccu7QXwhJgh7jgK 002XlbPbiG+0Q5EYwTL/wo9Gjl7pkVRLV6IruhLpwXlPYbPsAFzKEJ7QwV8Qjw== 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 1444025CA3; Fri, 17 Jun 2022 19:41:11 +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 25HJfANc030137; Fri, 17 Jun 2022 19:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfAkB030136; Fri, 17 Jun 2022 19:41:10 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:10 GMT Message-Id: <202206171941.25HJfAkB030136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 24f2f93f5e24 - stable/13 - linux(4): For future use move SCM definitions below socket options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 24f2f93f5e241a1e53783602ba195c8144416511 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494872; 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=zsaAYCr4EDyqfXD6v8jUaAjVcLmnHDSKcgAnvIMOY+w=; b=yRLmQXROs1VtwwJREK+iwMcWFYYnxIT0lC7cBosGGsAeMLTM4MTrw/s6RbxX6CaXimSCCU jYqZ0MalH9cNBvz6Ju/K3C22JAKwlqrdX+mrzPHTov9E2e71cskllIm0SwNAeCJR2/rovj cr/peWMO1EHK0deziMvKIvr+fRvcrWteG3lYVmw0B+j1sSDCH4iSoZCjFCEc0Fd9jGHsjf VcEQa+IvCiJcCiNg1hMXbE4QpF1sdbZRofIG6Ze1MGPuZ9WC8XsBh2eyyry5c0CnzlQtDY HtVFTUWOpcjZB8OU+O7BcoDTG4uj1J90c0FAWpd5dfO9bX+uX7ClQzXhZfkIaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494872; a=rsa-sha256; cv=none; b=CexdtrqTkD9snMezDW2VrM5ETL5mSso6zllHKNMVvemcBc31B33tG0a50Sf0viKo+9KlMI pzeNhvP2ndrDX08+zUxUbfcbCpwE+8ki0QjXmeoXI8oTIPjdQYC+dQivp2E5XPIomq2r35 MLF2HUN/Kz86fJZDYeOUjP/xy/l4zLLcxLhlS7lRANSWf/lFz1w7nqy1u8BbeSJzcl+SgX wWe7VL2z3XYiZ5zLDv2IGo0QBqWaoH3kEW4nW6wVdgIc2bXLPE4AZYNPhqQdB87caEz+mr JDm4QM+iSEsN97bB8YYyP9vcjSNKcVOHmf3leZAkMrY6UL0GjTLQ2jg4ZLcNkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=24f2f93f5e241a1e53783602ba195c8144416511 commit 24f2f93f5e241a1e53783602ba195c8144416511 Author: Dmitry Chagin AuthorDate: 2022-05-28 20:42:23 +0000 Commit: Dmitry Chagin 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