diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-16 23:00:36 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-16 23:00:36 +0000 |
commit | 14dd2ec093cfabda3ae7efeeaf0e23c66ebaccc0 (patch) | |
tree | 9a9ce5cff6ef92faa6e07a82785b9a6d6838f7e4 /net/ipv6 | |
parent | 847290510f811c572cc2aa80c1f02a04721410b1 (diff) |
Merge with 2.4.0-test1.
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/Config.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/Config.in b/net/ipv6/netfilter/Config.in index 626e1634d..3895451ba 100644 --- a/net/ipv6/netfilter/Config.in +++ b/net/ipv6/netfilter/Config.in @@ -31,12 +31,12 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then # The targets dep_tristate ' Packet filtering' CONFIG_IP6_NF_FILTER $CONFIG_IP6_NF_IPTABLES - if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then +# if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then # dep_tristate ' REJECT target support' CONFIG_IP6_NF_TARGET_REJECT $CONFIG_IP6_NF_FILTER # if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then # dep_tristate ' MIRROR target support (EXPERIMENTAL)' CONFIG_IP6_NF_TARGET_MIRROR $CONFIG_IP6_NF_FILTER # fi - fi +# fi dep_tristate ' Packet mangling' CONFIG_IP6_NF_MANGLE $CONFIG_IP6_NF_IPTABLES if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then |