diff options
author | He Zhe <zhe.he@windriver.com> | 2019-10-12 17:05:44 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-13 19:43:41 -0400 |
commit | e4089d509db56ad829dcdaba15dde0dd9ec4b77d (patch) | |
tree | 394bb15faf0795a02db7989074e7465f358b53ed /meta-openstack | |
parent | cfdcbde496bb5e5bd0b173735991c4b4b0193d17 (diff) | |
download | meta-cloud-services-e4089d509db56ad829dcdaba15dde0dd9ec4b77d.tar.gz |
meta-openstack: linux-yocto: Remove non-existing kernel options
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 <zhe.he@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg | 3 | ||||
-rw-r--r-- | meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg | 4 |
2 files changed, 0 insertions, 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 @@ | |||
1 | CONFIG_NF_NAT=m | 1 | CONFIG_NF_NAT=m |
2 | CONFIG_NF_NAT_NEEDED=y | ||
3 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 2 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
4 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
5 | CONFIG_NF_NAT_AMANDA=m | 3 | CONFIG_NF_NAT_AMANDA=m |
6 | CONFIG_NF_NAT_FTP=m | 4 | CONFIG_NF_NAT_FTP=m |
7 | CONFIG_NF_NAT_IRC=m | 5 | CONFIG_NF_NAT_IRC=m |
@@ -12,7 +10,6 @@ CONFIG_NETFILTER_XT_TARGET_NETMAP=m | |||
12 | 10 | ||
13 | CONFIG_NETFILTER_XT_TARGET_REDIRECT=m | 11 | CONFIG_NETFILTER_XT_TARGET_REDIRECT=m |
14 | 12 | ||
15 | CONFIG_NF_NAT_IPV4=m | ||
16 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 13 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
17 | CONFIG_IP_NF_TARGET_NETMAP=m | 14 | CONFIG_IP_NF_TARGET_NETMAP=m |
18 | CONFIG_IP_NF_TARGET_REDIRECT=m | 15 | 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 @@ | |||
1 | CONFIG_NF_CONNTRACK=y | 1 | CONFIG_NF_CONNTRACK=y |
2 | CONFIG_NF_NAT=m | 2 | CONFIG_NF_NAT=m |
3 | CONFIG_NF_NAT_NEEDED=y | ||
4 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
5 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
6 | CONFIG_NF_NAT_IPV4=m | ||
7 | CONFIG_IP_NF_NAT=m | 3 | CONFIG_IP_NF_NAT=m |