From nobody Mon Mar 31 17:44:16 2025 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 4ZRJR60FfTz5sL8T; Mon, 31 Mar 2025 17:44:18 +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 4ZRJR466Ndz3hlf; Mon, 31 Mar 2025 17:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743443056; 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=mrNFMyFUu8GwTWTttkWevYIoVYvr/jZ0mufZ9/JuH8Y=; b=cJtGlzNJrva1vC8egK4YpP4zct7EC23MjE+53u4DlY4OcBZaxS35Bm46FBkmZkeoH5eP4t teKbs0AUjmB8vsGiOG7Dp/49UUQbrG5xPPJ/pDVZEe5rn2GDz2u6QXpb2niR5tVJ6TjcRu RVWem/jHZF5xQwF1m7AgSKwh4wrOffZrSAfYshsf3YFkuqu5l45FxX8p6M57h8TVel4IyI 2HS/Kb/OPWdwp1va+JAdkpBNLo1xSkSG+h43USBrEHfXR591iQJL1XhU+e9pyh0QJpAxky eqK55W6IL9gn2LND3WSXaEjLfcLbvBMBrI/qKGab5SSuF+jnKFb3PRJd1z7nxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743443056; a=rsa-sha256; cv=none; b=M9JsPkEpKo4Jd2hosZVy5+B5dve0iSrziFioMRXr/WNjqU61Rr991LygxZptOONzKSabzR NSsAIbGyrvKPqGSIaWJd0kWzkxDBZLQ7ZdL29l6m98BM90VH0q7NyWxqc2Fm5jcMZ+KD4X 4Rry4otQVd/g58d3CacWezvh4OQjhH2P1nZ9dhx/aT1Fc+SpVawiNdTJPkDT67V5AgEpyq iNO7inF3q25ja5PGe7VNDSYb31ZwEjKu3yyesVPDIRS1E0ZHgsR9rNMs200PkMgy/gBwPh RiojjiG5h9nBUT0+ub1ivQAqL7j3QHTyfuE6iemO3jsdPjwzBecL7oe++aw/DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743443056; 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=mrNFMyFUu8GwTWTttkWevYIoVYvr/jZ0mufZ9/JuH8Y=; b=CjGQrrz34oXP8k8vvjmNCPcM+97Fmi0/JLOI2C+kxzehxjLoN1fm+tpPmXB8YKjJut8Tgq ZMnPUoDhlewmbRYN5RScCefa+Hh1cl+Bkc7Vm+NO8kBwKFw/KM7IjrbPW5Eor7y4TeYJvg 7PvB0WZvdRtMvypVnWYvMBHnPHVS2RPjE9FhFDkCGZWiHAlNqsV3/yF456Bk8DWZP0RBBi sNHMjiRd+AxNhl1qU95XdeHlVUtz1WyN+/aZYfiLbdQMGJGB4GfONN2GXYZNEHFta3u2RS Yt0ZcHPJw4v4cxT9V1FGdSM/GpcVhHoX6lmpYIECAo3SqvWH7rcxdXPxUvFh6g== 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 4ZRJR42GbnzvmL; Mon, 31 Mar 2025 17:44:16 +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 52VHiGNV061516; Mon, 31 Mar 2025 17:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VHiGoA061513; Mon, 31 Mar 2025 17:44:16 GMT (envelope-from git) Date: Mon, 31 Mar 2025 17:44:16 GMT Message-Id: <202503311744.52VHiGoA061513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 9e7af40094f7 - stable/14 - linux: Handle IP_RECVTOS cmsg type 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e7af40094f73670a09edf09936f084234102d58 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7af40094f73670a09edf09936f084234102d58 commit 9e7af40094f73670a09edf09936f084234102d58 Author: Alex S AuthorDate: 2025-03-10 18:12:36 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-31 17:43:06 +0000 linux: Handle IP_RECVTOS cmsg type This unbreaks apps using GameNetworkingSockets from Valve. (cherry picked from commit 186dc094cf1ce14b26c6dfa329a445357121238a) --- sys/compat/linux/linux_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index bed772d56684..4fcdd9517bda 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -135,7 +135,6 @@ linux_to_bsd_ip_sockopt(int opt) LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_RECVTTL"); return (IP_RECVTTL); case LINUX_IP_RECVTOS: - LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_RECVTOS"); return (IP_RECVTOS); case LINUX_IP_FREEBIND: LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_FREEBIND"); @@ -663,6 +662,8 @@ bsd_to_linux_ip_cmsg_type(int cmsg_type) switch (cmsg_type) { case IP_RECVORIGDSTADDR: return (LINUX_IP_RECVORIGDSTADDR); + case IP_RECVTOS: + return (LINUX_IP_TOS); } return (-1); }