diff options
| -rw-r--r-- | net/ipv4/Kconfig | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 10c944d42488..c7a814860ce1 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -53,7 +53,7 @@ config IP_ADVANCED_ROUTER | |||
| 53 | 53 | ||
| 54 | If unsure, say N here. | 54 | If unsure, say N here. |
| 55 | 55 | ||
| 56 | choice | 56 | choice |
| 57 | prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)" | 57 | prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)" |
| 58 | depends on IP_ADVANCED_ROUTER | 58 | depends on IP_ADVANCED_ROUTER |
| 59 | default ASK_IP_FIB_HASH | 59 | default ASK_IP_FIB_HASH |
| @@ -61,27 +61,29 @@ choice | |||
| 61 | config ASK_IP_FIB_HASH | 61 | config ASK_IP_FIB_HASH |
| 62 | bool "FIB_HASH" | 62 | bool "FIB_HASH" |
| 63 | ---help--- | 63 | ---help--- |
| 64 | Current FIB is very proven and good enough for most users. | 64 | Current FIB is very proven and good enough for most users. |
| 65 | 65 | ||
| 66 | config IP_FIB_TRIE | 66 | config IP_FIB_TRIE |
| 67 | bool "FIB_TRIE" | 67 | bool "FIB_TRIE" |
| 68 | ---help--- | 68 | ---help--- |
| 69 | Use new experimental LC-trie as FIB lookup algorithm. | 69 | Use new experimental LC-trie as FIB lookup algorithm. |
| 70 | This improves lookup performance if you have a large | 70 | This improves lookup performance if you have a large |
| 71 | number of routes. | 71 | number of routes. |
| 72 | 72 | ||
| 73 | LC-trie is a longest matching prefix lookup algorithm which | 73 | LC-trie is a longest matching prefix lookup algorithm which |
| 74 | performs better than FIB_HASH for large routing tables. | 74 | performs better than FIB_HASH for large routing tables. |
| 75 | But, it consumes more memory and is more complex. | 75 | But, it consumes more memory and is more complex. |
| 76 | 76 | ||
| 77 | LC-trie is described in: | 77 | LC-trie is described in: |
| 78 | 78 | ||
| 79 | IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson | 79 | IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson |
| 80 | IEEE Journal on Selected Areas in Communications, 17(6):1083-1092, June 1999 | 80 | IEEE Journal on Selected Areas in Communications, 17(6):1083-1092, |
| 81 | An experimental study of compression methods for dynamic tries | 81 | June 1999 |
| 82 | Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. | 82 | |
| 83 | http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ | 83 | An experimental study of compression methods for dynamic tries |
| 84 | 84 | Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. | |
| 85 | http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ | ||
| 86 | |||
| 85 | endchoice | 87 | endchoice |
| 86 | 88 | ||
| 87 | config IP_FIB_HASH | 89 | config IP_FIB_HASH |
| @@ -193,7 +195,7 @@ config IP_PNP_RARP | |||
| 193 | <file:Documentation/filesystems/nfsroot.txt> for details. | 195 | <file:Documentation/filesystems/nfsroot.txt> for details. |
| 194 | 196 | ||
| 195 | # not yet ready.. | 197 | # not yet ready.. |
| 196 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP | 198 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP |
| 197 | config NET_IPIP | 199 | config NET_IPIP |
| 198 | tristate "IP: tunneling" | 200 | tristate "IP: tunneling" |
| 199 | select INET_TUNNEL | 201 | select INET_TUNNEL |
| @@ -363,7 +365,7 @@ config INET_IPCOMP | |||
| 363 | ---help--- | 365 | ---help--- |
| 364 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), | 366 | Support for IP Payload Compression Protocol (IPComp) (RFC3173), |
| 365 | typically needed for IPsec. | 367 | typically needed for IPsec. |
| 366 | 368 | ||
| 367 | If unsure, say Y. | 369 | If unsure, say Y. |
| 368 | 370 | ||
| 369 | config INET_XFRM_TUNNEL | 371 | config INET_XFRM_TUNNEL |
| @@ -417,7 +419,7 @@ config INET_DIAG | |||
| 417 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by | 419 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by |
| 418 | native Linux tools such as ss. ss is included in iproute2, currently | 420 | native Linux tools such as ss. ss is included in iproute2, currently |
| 419 | downloadable at <http://linux-net.osdl.org/index.php/Iproute2>. | 421 | downloadable at <http://linux-net.osdl.org/index.php/Iproute2>. |
| 420 | 422 | ||
| 421 | If unsure, say Y. | 423 | If unsure, say Y. |
| 422 | 424 | ||
| 423 | config INET_TCP_DIAG | 425 | config INET_TCP_DIAG |
