Re: Help wanted with MFC 256820
On 10/18/22 17:16, Koichiro Iwao wrote: 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. stable/12 and stable/13 Approved. Make sure the NOINET version of the kernel still builds, and also LINT (for amd64). --HPS
Re: Help wanted with MFC 256820
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
commit a57f2b202fa26bc5c3ed6390fcc4dc2b30e178c1
Author: Hiroki Sato
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 = _usrreqs
},
+{
+ .pr_type = SOCK_RAW,
+ .pr_domain = ,
+ .pr_protocol = IPPROTO_ETHERIP,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+ .pr_input = encap6_input,
+ .pr_ctloutput = rip6_ctloutput,
+ .pr_usrreqs = _usrreqs
+},
{
.pr_type = SOCK_RAW,
.pr_domain = ,
commit 3a60c1392ba49525ce47a55477bd6a2dc27e3ab7
Author: Hiroki Sato
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 = _usrreqs
},
+{
+ .pr_type = SOCK_RAW,
+ .pr_domain = ,
+ .pr_protocol = IPPROTO_ETHERIP,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+ .pr_input = encap6_input,
+ .pr_ctloutput = rip6_ctloutput,
+ .pr_usrreqs = _usrreqs
+},
{
.pr_type = SOCK_RAW,
.pr_domain = ,
Re: Help wanted with MFC 256820
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
commit d91bc94ef5f1514213cb8d507beb3174dea42a73
Author: Hiroki Sato
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 = _usrreqs
},
+{
+ .pr_type = SOCK_RAW,
+ .pr_domain = ,
+ .pr_protocol = IPPROTO_ETHERIP,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+ .pr_input = encap6_input,
+ .pr_ctloutput = rip6_ctloutput,
+ .pr_usrreqs = _usrreqs
+},
{
.pr_type = SOCK_RAW,
.pr_domain = ,
Re: Help wanted with MFC 256820
On 10/17/22 01:59, Koichiro Iwao wrote: On Sun, Oct 16, 2022 at 06:12:40PM +0200, Hans Petter Selasky wrote: Hi, I think you should do: git cherry-pick -x 9823a0c0acf4fc277a71336ea737e1de7c65742f Then: git commit --amend And remove the "MFC after" tag. Then push it to stable/13 . You maybe need to specify the override authors flag before pushing. --HPS Hi Hans, Thanks for the advice. Do you mean you have approved me to do that? Send me the "git show" output of the commit before you push it, and I'll review it for you. --HPS
Re: Help wanted with MFC 256820
On Sun, Oct 16, 2022 at 06:12:40PM +0200, Hans Petter Selasky wrote: > > Hi, > > I think you should do: > > git cherry-pick -x 9823a0c0acf4fc277a71336ea737e1de7c65742f > > Then: > > git commit --amend > > And remove the "MFC after" tag. > > Then push it to stable/13 . You maybe need to specify the override authors > flag before pushing. > > --HPS Hi Hans, Thanks for the advice. Do you mean you have approved me to do that? -- meta
Re: Help wanted with MFC 256820
On 10/16/22 18:07, Koichiro Iwao wrote: Hi, I only have ports commit bit. I would like to ship this 1-year-old commit to each stable branch (at least stable/13). I'm happy to help with anything. I would like to try it if I'm permitted to do that with someone's approval. I would appreciate it if someone let me know the procedure. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256820 Thanks, Hi, I think you should do: git cherry-pick -x 9823a0c0acf4fc277a71336ea737e1de7c65742f Then: git commit --amend And remove the "MFC after" tag. Then push it to stable/13 . You maybe need to specify the override authors flag before pushing. --HPS
Help wanted with MFC 256820
Hi, I only have ports commit bit. I would like to ship this 1-year-old commit to each stable branch (at least stable/13). I'm happy to help with anything. I would like to try it if I'm permitted to do that with someone's approval. I would appreciate it if someone let me know the procedure. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256820 Thanks, -- meta
