diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/Kconfig | 2 | ||||
-rw-r--r-- | net/ipv6/netfilter/Kconfig | 2 | ||||
-rw-r--r-- | net/netfilter/Kconfig | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 16390add2ebf..363df9976c9d 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
@@ -6,7 +6,7 @@ menu "IP: Netfilter Configuration" | |||
6 | depends on INET && NETFILTER | 6 | depends on INET && NETFILTER |
7 | 7 | ||
8 | config NF_CONNTRACK_IPV4 | 8 | config NF_CONNTRACK_IPV4 |
9 | tristate "IPv4 support for new connection tracking (required for NAT) (EXPERIMENTAL)" | 9 | tristate "IPv4 connection tracking support (required for NAT) (EXPERIMENTAL)" |
10 | depends on EXPERIMENTAL && NF_CONNTRACK | 10 | depends on EXPERIMENTAL && NF_CONNTRACK |
11 | ---help--- | 11 | ---help--- |
12 | Connection tracking keeps a record of what packets have passed | 12 | Connection tracking keeps a record of what packets have passed |
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index d7c45a9c15fe..fc3e5eb4bc3f 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig | |||
@@ -6,7 +6,7 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)" | |||
6 | depends on INET && IPV6 && NETFILTER && EXPERIMENTAL | 6 | depends on INET && IPV6 && NETFILTER && EXPERIMENTAL |
7 | 7 | ||
8 | config NF_CONNTRACK_IPV6 | 8 | config NF_CONNTRACK_IPV6 |
9 | tristate "IPv6 support for new connection tracking (EXPERIMENTAL)" | 9 | tristate "IPv6 connection tracking support (EXPERIMENTAL)" |
10 | depends on EXPERIMENTAL && NF_CONNTRACK | 10 | depends on EXPERIMENTAL && NF_CONNTRACK |
11 | ---help--- | 11 | ---help--- |
12 | Connection tracking keeps a record of what packets have passed | 12 | Connection tracking keeps a record of what packets have passed |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index e0deac17df12..3a66878a1829 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -56,7 +56,7 @@ config NF_CONNTRACK_SUPPORT | |||
56 | below). | 56 | below). |
57 | 57 | ||
58 | config IP_NF_CONNTRACK_SUPPORT | 58 | config IP_NF_CONNTRACK_SUPPORT |
59 | bool "Layer 3 Dependent Connection tracking" | 59 | bool "Layer 3 Dependent Connection tracking (OBSOLETE)" |
60 | help | 60 | help |
61 | The old, Layer 3 dependent ip_conntrack subsystem of netfilter. | 61 | The old, Layer 3 dependent ip_conntrack subsystem of netfilter. |
62 | 62 | ||
@@ -125,7 +125,7 @@ config NF_CT_PROTO_GRE | |||
125 | depends on EXPERIMENTAL && NF_CONNTRACK | 125 | depends on EXPERIMENTAL && NF_CONNTRACK |
126 | 126 | ||
127 | config NF_CT_PROTO_SCTP | 127 | config NF_CT_PROTO_SCTP |
128 | tristate 'SCTP protocol on new connection tracking support (EXPERIMENTAL)' | 128 | tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)' |
129 | depends on EXPERIMENTAL && NF_CONNTRACK | 129 | depends on EXPERIMENTAL && NF_CONNTRACK |
130 | default n | 130 | default n |
131 | help | 131 | help |
@@ -151,7 +151,7 @@ config NF_CONNTRACK_AMANDA | |||
151 | To compile it as a module, choose M here. If unsure, say N. | 151 | To compile it as a module, choose M here. If unsure, say N. |
152 | 152 | ||
153 | config NF_CONNTRACK_FTP | 153 | config NF_CONNTRACK_FTP |
154 | tristate "FTP support on new connection tracking (EXPERIMENTAL)" | 154 | tristate "FTP protocol support (EXPERIMENTAL)" |
155 | depends on EXPERIMENTAL && NF_CONNTRACK | 155 | depends on EXPERIMENTAL && NF_CONNTRACK |
156 | help | 156 | help |
157 | Tracking FTP connections is problematic: special helpers are | 157 | Tracking FTP connections is problematic: special helpers are |