merged Bruce
On Sat, Oct 12, 2019 at 5:05 AM <[email protected]> wrote: > > From: He Zhe <[email protected]> > > The following kernel options have been removed from kernel. > > CONFIG_NF_NAT_PROTO_SCTP removed by > faec18dbb0405 ("netfilter: nat: remove l4proto->manip_pkt") > > CONFIG_NF_NAT_IPV4 removed by > 3bf195ae6037e ("netfilter: nat: merge nf_nat_ipv4,6 into nat core") > > CONFIG_NF_CONNTRACK_PROC_COMPAT removed by > adf0516845bc ("netfilter: remove ip_conntrack* sysctl compat code") > > CONFIG_NF_NAT_NEEDED removed by > 4806e975729f ("netfilter: replace NF_NAT_NEEDED with > IS_ENABLED(CONFIG_NF_NAT)") > > Signed-off-by: He Zhe <[email protected]> > --- > meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg | 3 --- > meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg | 4 ---- > 2 files changed, 7 deletions(-) > > diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg > b/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg > index 6e1cff7..91b8209 100644 > --- a/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg > +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg > @@ -1,7 +1,5 @@ > CONFIG_NF_NAT=m > -CONFIG_NF_NAT_NEEDED=y > CONFIG_NF_NAT_PROTO_UDPLITE=m > -CONFIG_NF_NAT_PROTO_SCTP=m > CONFIG_NF_NAT_AMANDA=m > CONFIG_NF_NAT_FTP=m > CONFIG_NF_NAT_IRC=m > @@ -12,7 +10,6 @@ CONFIG_NETFILTER_XT_TARGET_NETMAP=m > > CONFIG_NETFILTER_XT_TARGET_REDIRECT=m > > -CONFIG_NF_NAT_IPV4=m > CONFIG_IP_NF_TARGET_MASQUERADE=m > CONFIG_IP_NF_TARGET_NETMAP=m > CONFIG_IP_NF_TARGET_REDIRECT=m > diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > index 676a091..5821a43 100644 > --- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > @@ -1,7 +1,3 @@ > CONFIG_NF_CONNTRACK=y > CONFIG_NF_NAT=m > -CONFIG_NF_NAT_NEEDED=y > -CONFIG_NF_NAT_PROTO_SCTP=m > -CONFIG_NF_CONNTRACK_PROC_COMPAT=y > -CONFIG_NF_NAT_IPV4=m > CONFIG_IP_NF_NAT=m > -- > 2.7.4 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
