From nobody Fri Dec 27 17:06:20 2024 X-Original-To: dev-commits-src-all@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 4YKX2h6wTSz5j3By; Fri, 27 Dec 2024 17:06:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKX2h6JsPz4vl9; Fri, 27 Dec 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319180; 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=3yIxE9Zil56DEYQaqYmrWA817rnTaORL7dakLeaTfzE=; b=lWrMkqIC0vTtULFSR/OP5yY5+Ua9HvJGPu7CKlhkNp7cKG1plP5DwBN2jlpfYbhv6W4Zh+ AWQKuiO2CEVL3NScGbJpeDGmkdeuHAQWQm+6wktCNrieVvjuEWw2y3nOl2Yihnxt8snpQ+ 88WI5SxHbhZ4+W+UNEopPtDb/CWMaWWKJYEUEWepocFPXpES8KcnoQEiwjdjc/WTEFeeCa hiGhXsLM/1vHkis8pAzMtW7sI0mMSwEQTuap3I6p87ERpxGqw/zdrKTR8AvSsUM+/0/OCu mji2fCyr7OWboW/HYKPOG6tDV/k3Y8ZL3aZ+rvUPXMvronBY/T8B8YGdf6uJVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735319180; 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=3yIxE9Zil56DEYQaqYmrWA817rnTaORL7dakLeaTfzE=; b=h+I/aDcIoJMgDTkTAJG+P0WZoLQLQAxoWgB2IakfNrkUZcUWTlgXcEZ30NvpLcHj+/msjM WfpynTol+KEKIrqUXLzoa7AHq9hDeyg6RLAVBT4WSxaT1sQW/7b9ah/QQ4s4N011cVpwes 6A6/KfiITPYbWaovESStadNX+fEJ3NwaKX/MsglzqSZuqlWlu508hEEmkYdDUkpxBZZ330 Vctat6URZIjQJRDynlQemoUhebrfhXgJFpHatHUesp0kBnjkzyT3fQuIK6hapMnzPUSJen OmjF/j6ZorqhFyIQ6joYhl7Fk4E6sOIoZYCPSE7oumB2b8esl6br1/14J6l9zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735319180; a=rsa-sha256; cv=none; b=yAYOjTJxitZ3kcpU6fzl9T2vlOaCPWldLw8Qb7pb/iUtT3AqZwDvaF3wCVIB7LJ3fNWIzZ L/iyOaMmhslEAUTunXteMgXPYEDDErIVtF8bb1Ycogo9MxJY8EMVc6TUJSinaxVdHshBsO krT0k5ZaoTigva6m+stiy+saznP+JPm8Fet6l/7lLNykrVD08OU+cjMdwwJX0K9E1U7KfA 3Q9V3uBSlBzF+blaSNWAwLRyMtPf9NPY12GSj1VciadYa3wUVqFU5uiKucc92+qs3TUlyz Y5d4WMGb2KjAprRyduhwLjVTSQNf/EBCxPvEd1MkWxebi17ZJgyEcKr3Yj/bzQ== 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 4YKX2h5VGlzn73; Fri, 27 Dec 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH6KEw037181; Fri, 27 Dec 2024 17:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH6Kdd037178; Fri, 27 Dec 2024 17:06:20 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:06:20 GMT Message-Id: <202412271706.4BRH6Kdd037178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4425d92a8044 - stable/14 - socket: Move SO_SPLICE next to other socket option constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4425d92a8044a82b8eac48b3131802d96aaf91f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4425d92a8044a82b8eac48b3131802d96aaf91f2 commit 4425d92a8044a82b8eac48b3131802d96aaf91f2 Author: John Baldwin AuthorDate: 2024-11-19 15:25:49 +0000 Commit: John Baldwin CommitDate: 2024-12-27 15:30:05 +0000 socket: Move SO_SPLICE next to other socket option constants Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47626 (cherry picked from commit 48a88a4ee95a725a435a817401ea4c0d9c990cd1) --- 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 22b764b07c2b..65b5c5ee001d 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -173,10 +173,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 */