On Mon, Oct 17, 2022 at 09:16:12AM +0200, Hans Petter Selasky wrote: > Send me the "git show" output of the commit before you push it, and I'll > review it for you. > > --HPS
Here it is. See attached file. -- meta <m...@freebsd.org>
commit d91bc94ef5f1514213cb8d507beb3174dea42a73 Author: Hiroki Sato <h...@freebsd.org> Date: Fri Aug 27 17:14:35 2021 +0900 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 Approved by: to-be-filled (cherry picked from commit 9823a0c0acf4fc277a71336ea737e1de7c65742f) diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 21b7d660676f..fb4f76dd698c 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -291,6 +291,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,