diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-10-08 05:35:17 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:17 -0400 |
commit | aba0d34800d7f56493b4d5548cc06498a4d69124 (patch) | |
tree | 1ee6e0cf91cca286ea0601dcedfd5febc1461742 /net/ipv4 | |
parent | 20f3c56f4d7c76bcb66050f3364aa8da110f5bbd (diff) |
netfilter: xtables: sort extensions alphabetically in Kconfig
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/Kconfig | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 07757ac8d5d8..087b82906848 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
@@ -62,15 +62,16 @@ config IP_NF_IPTABLES | |||
62 | To compile it as a module, choose M here. If unsure, say N. | 62 | To compile it as a module, choose M here. If unsure, say N. |
63 | 63 | ||
64 | # The matches. | 64 | # The matches. |
65 | config IP_NF_MATCH_ECN | 65 | config IP_NF_MATCH_ADDRTYPE |
66 | tristate '"ecn" match support' | 66 | tristate '"addrtype" address type match support' |
67 | depends on IP_NF_IPTABLES | 67 | depends on IP_NF_IPTABLES |
68 | depends on NETFILTER_ADVANCED | 68 | depends on NETFILTER_ADVANCED |
69 | help | 69 | help |
70 | This option adds a `ECN' match, which allows you to match against | 70 | This option allows you to match what routing thinks of an address, |
71 | the IPv4 and TCP header ECN fields. | 71 | eg. UNICAST, LOCAL, BROADCAST, ... |
72 | 72 | ||
73 | To compile it as a module, choose M here. If unsure, say N. | 73 | If you want to compile it as a module, say M here and read |
74 | <file:Documentation/kbuild/modules.txt>. If unsure, say `N'. | ||
74 | 75 | ||
75 | config IP_NF_MATCH_AH | 76 | config IP_NF_MATCH_AH |
76 | tristate '"ah" match support' | 77 | tristate '"ah" match support' |
@@ -82,26 +83,25 @@ config IP_NF_MATCH_AH | |||
82 | 83 | ||
83 | To compile it as a module, choose M here. If unsure, say N. | 84 | To compile it as a module, choose M here. If unsure, say N. |
84 | 85 | ||
85 | config IP_NF_MATCH_TTL | 86 | config IP_NF_MATCH_ECN |
86 | tristate '"ttl" match support' | 87 | tristate '"ecn" match support' |
87 | depends on IP_NF_IPTABLES | 88 | depends on IP_NF_IPTABLES |
88 | depends on NETFILTER_ADVANCED | 89 | depends on NETFILTER_ADVANCED |
89 | help | 90 | help |
90 | This adds CONFIG_IP_NF_MATCH_TTL option, which enabled the user | 91 | This option adds a `ECN' match, which allows you to match against |
91 | to match packets by their TTL value. | 92 | the IPv4 and TCP header ECN fields. |
92 | 93 | ||
93 | To compile it as a module, choose M here. If unsure, say N. | 94 | To compile it as a module, choose M here. If unsure, say N. |
94 | 95 | ||
95 | config IP_NF_MATCH_ADDRTYPE | 96 | config IP_NF_MATCH_TTL |
96 | tristate '"addrtype" address type match support' | 97 | tristate '"ttl" match support' |
97 | depends on IP_NF_IPTABLES | 98 | depends on IP_NF_IPTABLES |
98 | depends on NETFILTER_ADVANCED | 99 | depends on NETFILTER_ADVANCED |
99 | help | 100 | help |
100 | This option allows you to match what routing thinks of an address, | 101 | This adds CONFIG_IP_NF_MATCH_TTL option, which enabled the user |
101 | eg. UNICAST, LOCAL, BROADCAST, ... | 102 | to match packets by their TTL value. |
102 | 103 | ||
103 | If you want to compile it as a module, say M here and read | 104 | To compile it as a module, choose M here. If unsure, say N. |
104 | <file:Documentation/kbuild/modules.txt>. If unsure, say `N'. | ||
105 | 105 | ||
106 | # `filter', generic and specific targets | 106 | # `filter', generic and specific targets |
107 | config IP_NF_FILTER | 107 | config IP_NF_FILTER |
@@ -186,26 +186,26 @@ config IP_NF_TARGET_MASQUERADE | |||
186 | 186 | ||
187 | To compile it as a module, choose M here. If unsure, say N. | 187 | To compile it as a module, choose M here. If unsure, say N. |
188 | 188 | ||
189 | config IP_NF_TARGET_REDIRECT | 189 | config IP_NF_TARGET_NETMAP |
190 | tristate "REDIRECT target support" | 190 | tristate "NETMAP target support" |
191 | depends on NF_NAT | 191 | depends on NF_NAT |
192 | depends on NETFILTER_ADVANCED | 192 | depends on NETFILTER_ADVANCED |
193 | help | 193 | help |
194 | REDIRECT is a special case of NAT: all incoming connections are | 194 | NETMAP is an implementation of static 1:1 NAT mapping of network |
195 | mapped onto the incoming interface's address, causing the packets to | 195 | addresses. It maps the network address part, while keeping the host |
196 | come to the local machine instead of passing through. This is | 196 | address part intact. |
197 | useful for transparent proxies. | ||
198 | 197 | ||
199 | To compile it as a module, choose M here. If unsure, say N. | 198 | To compile it as a module, choose M here. If unsure, say N. |
200 | 199 | ||
201 | config IP_NF_TARGET_NETMAP | 200 | config IP_NF_TARGET_REDIRECT |
202 | tristate "NETMAP target support" | 201 | tristate "REDIRECT target support" |
203 | depends on NF_NAT | 202 | depends on NF_NAT |
204 | depends on NETFILTER_ADVANCED | 203 | depends on NETFILTER_ADVANCED |
205 | help | 204 | help |
206 | NETMAP is an implementation of static 1:1 NAT mapping of network | 205 | REDIRECT is a special case of NAT: all incoming connections are |
207 | addresses. It maps the network address part, while keeping the host | 206 | mapped onto the incoming interface's address, causing the packets to |
208 | address part intact. | 207 | come to the local machine instead of passing through. This is |
208 | useful for transparent proxies. | ||
209 | 209 | ||
210 | To compile it as a module, choose M here. If unsure, say N. | 210 | To compile it as a module, choose M here. If unsure, say N. |
211 | 211 | ||
@@ -300,6 +300,19 @@ config IP_NF_MANGLE | |||
300 | 300 | ||
301 | To compile it as a module, choose M here. If unsure, say N. | 301 | To compile it as a module, choose M here. If unsure, say N. |
302 | 302 | ||
303 | config IP_NF_TARGET_CLUSTERIP | ||
304 | tristate "CLUSTERIP target support (EXPERIMENTAL)" | ||
305 | depends on IP_NF_MANGLE && EXPERIMENTAL | ||
306 | depends on NF_CONNTRACK_IPV4 | ||
307 | depends on NETFILTER_ADVANCED | ||
308 | select NF_CONNTRACK_MARK | ||
309 | help | ||
310 | The CLUSTERIP target allows you to build load-balancing clusters of | ||
311 | network servers without having a dedicated load-balancing | ||
312 | router/server/switch. | ||
313 | |||
314 | To compile it as a module, choose M here. If unsure, say N. | ||
315 | |||
303 | config IP_NF_TARGET_ECN | 316 | config IP_NF_TARGET_ECN |
304 | tristate "ECN target support" | 317 | tristate "ECN target support" |
305 | depends on IP_NF_MANGLE | 318 | depends on IP_NF_MANGLE |
@@ -330,19 +343,6 @@ config IP_NF_TARGET_TTL | |||
330 | 343 | ||
331 | To compile it as a module, choose M here. If unsure, say N. | 344 | To compile it as a module, choose M here. If unsure, say N. |
332 | 345 | ||
333 | config IP_NF_TARGET_CLUSTERIP | ||
334 | tristate "CLUSTERIP target support (EXPERIMENTAL)" | ||
335 | depends on IP_NF_MANGLE && EXPERIMENTAL | ||
336 | depends on NF_CONNTRACK_IPV4 | ||
337 | depends on NETFILTER_ADVANCED | ||
338 | select NF_CONNTRACK_MARK | ||
339 | help | ||
340 | The CLUSTERIP target allows you to build load-balancing clusters of | ||
341 | network servers without having a dedicated load-balancing | ||
342 | router/server/switch. | ||
343 | |||
344 | To compile it as a module, choose M here. If unsure, say N. | ||
345 | |||
346 | # raw + specific targets | 346 | # raw + specific targets |
347 | config IP_NF_RAW | 347 | config IP_NF_RAW |
348 | tristate 'raw table support (required for NOTRACK/TRACE)' | 348 | tristate 'raw table support (required for NOTRACK/TRACE)' |