Date: Wed, 19 Oct 2022 00:16:24 +0900 From: Koichiro Iwao <meta@FreeBSD.org> To: Hans Petter Selasky <hps@selasky.org> Cc: freebsd-net@freebsd.org Subject: Re: Help wanted with MFC 256820 Message-ID: <20221018151624.buee3gcs77rc3smo@icepick.vmeta.jp> In-Reply-To: <af2b746d-fa30-6edb-545b-f1178a0cfd12@selasky.org> References: <558b6dd1a98fdb81df0443202695172c@freebsd.org> <e8426058-32f8-5f27-ba94-8ed2badf7fb5@selasky.org> <20221016235900.juemalq6mal7oiua@icepick.vmeta.jp> <af2b746d-fa30-6edb-545b-f1178a0cfd12@selasky.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--xkcxtklda43gn6q7
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
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
I would like to MFC it to stable/12, too. See attached patches for both
branch.
--
meta <meta@FreeBSD.org>
--xkcxtklda43gn6q7
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="12-stable.patch"
commit a57f2b202fa26bc5c3ed6390fcc4dc2b30e178c1
Author: Hiroki Sato <hrs@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 (to cherry-pick)
(cherry picked from commit 9823a0c0acf4fc277a71336ea737e1de7c65742f)
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index b5270394d9f3..43d99e484fb8 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -295,6 +295,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,
--xkcxtklda43gn6q7
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="13-stable.patch"
commit 3a60c1392ba49525ce47a55477bd6a2dc27e3ab7
Author: Hiroki Sato <hrs@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 (to cherry-pick)
(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,
--xkcxtklda43gn6q7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20221018151624.buee3gcs77rc3smo>