ipv4/netfilter/Kconfig: simplify dependencies
Subsystems (2)
PATCH 1/1 ipv4/netfilter/Kconfig: simplify dependencies
It seems that originating from the automatic Kconfig transition, some dependencies in ipv4/netfilter/Kconfig are correct, but too complicated.
The patch below makes them a bit more simple.
net/ipv4/netfilter/Kconfig renamed from net/ipv4/netfilter/Kconfig.old +4 -4
@@ -307,7 +307,7 @@ config IP_NF_NAT_NEEDED bool - depends on IP_NF_CONNTRACK!=y && IP_NF_IPTABLES!=y && (IP_NF_COMPAT_IPCHAINS!=y && IP_NF_COMPAT_IPFWADM || IP_NF_COMPAT_IPCHAINS) || IP_NF_IPTABLES && IP_NF_CONNTRACK && IP_NF_NAT + depends on IP_NF_COMPAT_IPFWADM || IP_NF_COMPAT_IPCHAINS || IP_NF_NAT default y config IP_NF_TARGET_MASQUERADE
@@ -392,19 +392,19 @@ # or $CONFIG_IP_NF_FTP (m or y), whichever is weaker. Argh. config IP_NF_NAT_FTP tristate - depends on IP_NF_IPTABLES!=n && IP_NF_CONNTRACK!=n && IP_NF_NAT!=n + depends on IP_NF_NAT!=n default IP_NF_NAT if IP_NF_FTP=y default m if IP_NF_FTP=m config IP_NF_NAT_TFTP tristate - depends on IP_NF_IPTABLES!=n && IP_NF_CONNTRACK!=n && IP_NF_NAT!=n + depends on IP_NF_NAT!=n default IP_NF_NAT if IP_NF_TFTP=y default m if IP_NF_TFTP=m config IP_NF_NAT_AMANDA tristate - depends on IP_NF_IPTABLES!=n && IP_NF_CONNTRACK!=n && IP_NF_NAT!=n + depends on IP_NF_NAT!=n default IP_NF_NAT if IP_NF_AMANDA=y default m if IP_NF_AMANDA=m