From nobody Tue Nov 19 15:28:47 2024 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 4Xt7gh41Wrz5f842; Tue, 19 Nov 2024 15:28:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xt7gh18P0z4CgY; Tue, 19 Nov 2024 15:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732030128; 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=BGLn4VqPjz2ni325qep+BNSst6kc351CvESg4fxKRwQ=; b=QvED4QixvY1n3pQfkdJQlWxx53Z7qH8TBoF4iVmRNmk9D5ztA8fgtyPLvmzgphKZEnXnOp ahYEwY3tKJpsDQWjtxMXNoyGtACE4kgGFNsyPh0QjHL1XGy2krwSRybrLVM6LA9H7Ua59d a3g9+hg2Zb3yVpJIZVWCa/iYHphw4CxVmtqPyg85Abq8QryTm4wzdlQlsXKix+Xy5g/vTU mzB0l4L6m6QN7HVz/i+KudjZyzpOBzZgZXQ2sHJnqCqFxsuEVlbgPmuoHaanNFs1ba2JUk p1DtuJVozWW1GmCizpAXKTbOqqyBKjxlTDMT7Aa5MYdsi7RL2v4QruQ9SC6czQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732030128; 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=BGLn4VqPjz2ni325qep+BNSst6kc351CvESg4fxKRwQ=; b=lHvo5xFtZla/Qt5700WtCyoS407Nzkp+NvUfUFF0E+bhlJMPj5JgzkBMxzlrghQBP6BOL8 Q2kS2nCaemZmnR0NSRDrpFe41QJrCfmavR9w+f7esf8YtUPUnbIYVpWwXNNTZhBYgLtX8G jI57oOX5YXwownmAiBRgbltOeWOO+fa5jSHC91PnzFc/NWD3WGGSSuuqvsX6ORDGELSxsc D+Ic/UhblTtvGgeM0AWlKQkXiIYcbCYYa1AkoXwRqfooZ8Lg197ubniqO+c0+9VrWhnAFK Aq4OdRKCmp3/fniw7IPNJsbg7a3RaaXruwli70VttauljeWDhmmOxp1NebEgKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732030128; a=rsa-sha256; cv=none; b=wGtIxdWEUsWWLM31n6D4eHZ98guXIyh2mOoa91VtLzl4o3//1BHiTlFeZAg9eVXoSIIrdT 5vxHsMi1nSmY/gxuQErv1e1o85stcNi8OPIYkfdcKdwJ3uUa2dx0muURdbtmA1c/d2ppVg JUyYGpsDX1ujvkPE/hgCobeU8SF15wJZEoxq+xJJwrBi77soR34E/gbvbuOmjwOM4cJ2lL GIC5KPNcMAFNfTnvAGLHqQfRJmRxdCsf/xw/EvlPbyPGDxd2B2ro0q22PsTmBYx6HLcYMp apgaIfnkxEqsuBkbK+uiW6yXcSXBoojS5FwGsiGM8AECwKae7MDAUCUCncc9lA== 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 4Xt7gh0XnwzG6D; Tue, 19 Nov 2024 15:28:48 +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 4AJFSlJn041476; Tue, 19 Nov 2024 15:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJFSllC041473; Tue, 19 Nov 2024 15:28:47 GMT (envelope-from git) Date: Tue, 19 Nov 2024 15:28:47 GMT Message-Id: <202411191528.4AJFSllC041473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 48a88a4ee95a - main - socket: Move SO_SPLICE next to other socket option constants 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 48a88a4ee95a725a435a817401ea4c0d9c990cd1 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=48a88a4ee95a725a435a817401ea4c0d9c990cd1 commit 48a88a4ee95a725a435a817401ea4c0d9c990cd1 Author: John Baldwin AuthorDate: 2024-11-19 15:25:49 +0000 Commit: John Baldwin CommitDate: 2024-11-19 15:25:49 +0000 socket: Move SO_SPLICE next to other socket option constants Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47626 --- 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 a1b220ce4bae..cc82d97e9dd5 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -171,10 +171,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 */