[NETFILTER 2/2]: Kconfig: default DCCP/SCTP conntrack support to the protocol config values

[NETFILTER 2/2]: Kconfig: default DCCP/SCTP conntrack support to the protocol config values

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: 02.diff --]
[-- Type: text/x-diff, Size: 2153 bytes --]

[NETFILTER]: Kconfig: default DCCP/SCTP conntrack support to the protocol config values

When conntrack and DCCP/SCTP protocols are enabled, chances are good that
people also want DCCP/SCTP conntrack and NAT support.

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit a080f74033697d16e644c6e81ff990c4aac21085
tree 8b362f99d92f388d93140471dd2771bbe70fa04f
parent 3f6886bf0dcfb06f81de3b27b607a45143c27916
author Patrick McHardy <kaber@trash.net> Tue, 06 May 2008 09:19:05 +0200
committer Patrick McHardy <kaber@trash.net> Tue, 06 May 2008 09:19:05 +0200

 net/netfilter/Kconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index c1fc0f1..aa8d80c 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -90,6 +90,7 @@ config NF_CT_PROTO_DCCP
 	tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)'
 	depends on EXPERIMENTAL && NF_CONNTRACK
 	depends on NETFILTER_ADVANCED
+	default IP_DCCP
 	help
 	  With this option enabled, the layer 3 independent connection
 	  tracking code will be able to do state tracking on DCCP connections.
@@ -104,6 +105,7 @@ config NF_CT_PROTO_SCTP
 	tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)'
 	depends on EXPERIMENTAL && NF_CONNTRACK
 	depends on NETFILTER_ADVANCED
+	default IP_SCTP
 	help
 	  With this option enabled, the layer 3 independent connection
 	  tracking code will be able to do state tracking on SCTP connections.
@@ -532,6 +534,7 @@ config NETFILTER_XT_MATCH_DCCP
 	tristate '"dccp" protocol match support'
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_ADVANCED
+	default IP_DCCP
 	help
 	  With this option enabled, you will be able to use the iptables
 	  `dccp' match in order to match on DCCP source/destination ports
@@ -725,6 +728,7 @@ config NETFILTER_XT_MATCH_SCTP
 	tristate  '"sctp" protocol match support (EXPERIMENTAL)'
 	depends on NETFILTER_XTABLES && EXPERIMENTAL
 	depends on NETFILTER_ADVANCED
+	default IP_SCTP
 	help
 	  With this option enabled, you will be able to use the 
 	  `sctp' match in order to match on SCTP source/destination ports

Re: [NETFILTER 2/2]: Kconfig: default DCCP/SCTP conntrack support to the protocol config values

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Wed, 07 May 2008 09:47:38 +0200

> [NETFILTER]: Kconfig: default DCCP/SCTP conntrack support to the protocol config values
> 
> When conntrack and DCCP/SCTP protocols are enabled, chances are good that
> people also want DCCP/SCTP conntrack and NAT support.
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Also applied, thanks Patrick.