From owner-svn-src-all@freebsd.org Mon Aug 24 16:23:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 479183C68A2; Mon, 24 Aug 2020 16:23:28 +0000 (UTC) (envelope-from trasz@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZy9D1BZBz3bSP; Mon, 24 Aug 2020 16:23:28 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D8861B71D; Mon, 24 Aug 2020 16:23:28 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OGNRDX074133; Mon, 24 Aug 2020 16:23:27 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OGNRxq074132; Mon, 24 Aug 2020 16:23:27 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008241623.07OGNRxq074132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 24 Aug 2020 16:23:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364705 - stable/12/sys/compat/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/12/sys/compat/linux X-SVN-Commit-Revision: 364705 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 16:23:28 -0000 Author: trasz Date: Mon Aug 24 16:23:27 2020 New Revision: 364705 URL: https://svnweb.freebsd.org/changeset/base/364705 Log: MFC r362735: Make linux(4) support SO_PROTOCOL. Running Python test suite with python3.8 from Focal triggers those. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/compat/linux/linux_socket.c stable/12/sys/compat/linux/linux_socket.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linux/linux_socket.c ============================================================================== --- stable/12/sys/compat/linux/linux_socket.c Mon Aug 24 16:21:03 2020 (r364704) +++ stable/12/sys/compat/linux/linux_socket.c Mon Aug 24 16:23:27 2020 (r364705) @@ -235,6 +235,8 @@ linux_to_bsd_so_sockopt(int opt) return (SO_TIMESTAMP); case LINUX_SO_ACCEPTCONN: return (SO_ACCEPTCONN); + case LINUX_SO_PROTOCOL: + return (SO_PROTOCOL); } return (-1); } Modified: stable/12/sys/compat/linux/linux_socket.h ============================================================================== --- stable/12/sys/compat/linux/linux_socket.h Mon Aug 24 16:21:03 2020 (r364704) +++ stable/12/sys/compat/linux/linux_socket.h Mon Aug 24 16:23:27 2020 (r364705) @@ -199,6 +199,7 @@ int linux_accept(struct thread *td, struct linux_accep #define LINUX_SO_ACCEPTCONN 30 #define LINUX_SO_SNDBUFFORCE 32 #define LINUX_SO_RCVBUFFORCE 33 +#define LINUX_SO_PROTOCOL 38 /* Socket options */ #define LINUX_IP_TOS 1