From owner-dev-commits-src-main@freebsd.org Fri Aug 27 08:15:14 2021 Return-Path: Delivered-To: dev-commits-src-main@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 F24C965A45E; Fri, 27 Aug 2021 08:15:14 +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 4Gwsw269HWz4fPY; Fri, 27 Aug 2021 08:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BAE3A1FD3F; Fri, 27 Aug 2021 08:15:14 +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 17R8FExj098861; Fri, 27 Aug 2021 08:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17R8FEGc098860; Fri, 27 Aug 2021 08:15:14 GMT (envelope-from git) Date: Fri, 27 Aug 2021 08:15:14 GMT Message-Id: <202108270815.17R8FEGc098860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hiroki Sato Subject: git: 9823a0c0acf4 - main - inet6(4): add a missing IPPROTO_ETHERIP entry MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9823a0c0acf4fc277a71336ea737e1de7c65742f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Aug 2021 08:15:15 -0000 The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/src/commit/?id=9823a0c0acf4fc277a71336ea737e1de7c65742f commit 9823a0c0acf4fc277a71336ea737e1de7c65742f Author: Hiroki Sato AuthorDate: 2021-08-27 08:14:35 +0000 Commit: Hiroki Sato CommitDate: 2021-08-27 08:14:35 +0000 inet6(4): add a missing IPPROTO_ETHERIP entry bridge(4) + gif(4) did not work when the outer protocol was IPv6. Submitted by: Masahiro Kozuka PR: 256820 MFC after: 3 days --- sys/netinet6/in6_proto.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 56ef41a27e88..909564b8c7e5 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -293,6 +293,15 @@ struct protosw inet6sw[] = { .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs }, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_ETHERIP, + .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, + .pr_input = encap6_input, + .pr_ctloutput = rip6_ctloutput, + .pr_usrreqs = &rip6_usrreqs +}, { .pr_type = SOCK_RAW, .pr_domain = &inet6domain,