mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@fs.tum.de>
To: coreteam@netfilter.org
Cc: linux-kernel@vger.kernel.org, netfilter-devel@lists.netfilter.org
Subject: [2.6 patch] ipv4/netfilter/Kconfig: simplify dependencies
Date: Sat, 17 Jul 2004 18:53:04 +0200	[thread overview]
Message-ID: <20040717165303.GE4759@fs.tum.de> (raw)

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.

--- linux-2.6.8-rc1-mm1-full/net/ipv4/netfilter/Kconfig.old	2004-07-17 17:43:55.000000000 +0200
+++ linux-2.6.8-rc1-mm1-full/net/ipv4/netfilter/Kconfig	2004-07-17 18:12:43.000000000 +0200
@@ -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
 


                 reply	other threads:[~2004-07-17 16:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040717165303.GE4759@fs.tum.de \
    --to=bunk@fs.tum.de \
    --cc=coreteam@netfilter.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netfilter-devel@lists.netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®