diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/Kconfig | 6 | ||||
-rw-r--r-- | net/ipv4/arp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/Kconfig | 4 | ||||
-rw-r--r-- | net/ipv4/netfilter/Kconfig | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 30af4a4dfcc8..d172a9804448 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH | |||
64 | config IP_FIB_TRIE | 64 | config IP_FIB_TRIE |
65 | bool "FIB_TRIE" | 65 | bool "FIB_TRIE" |
66 | ---help--- | 66 | ---help--- |
67 | Use new experimental LC-trie as FIB lookup algoritm. | 67 | Use new experimental LC-trie as FIB lookup algorithm. |
68 | This improves lookup performance if you have a large | 68 | This improves lookup performance if you have a large |
69 | number of routes. | 69 | number of routes. |
70 | 70 | ||
@@ -526,7 +526,7 @@ config TCP_CONG_HYBLA | |||
526 | ---help--- | 526 | ---help--- |
527 | TCP-Hybla is a sender-side only change that eliminates penalization of | 527 | TCP-Hybla is a sender-side only change that eliminates penalization of |
528 | long-RTT, large-bandwidth connections, like when satellite legs are | 528 | long-RTT, large-bandwidth connections, like when satellite legs are |
529 | involved, expecially when sharing a common bottleneck with normal | 529 | involved, especially when sharing a common bottleneck with normal |
530 | terrestrial connections. | 530 | terrestrial connections. |
531 | 531 | ||
532 | config TCP_CONG_VEGAS | 532 | config TCP_CONG_VEGAS |
@@ -556,7 +556,7 @@ config TCP_CONG_LP | |||
556 | default n | 556 | default n |
557 | ---help--- | 557 | ---help--- |
558 | TCP Low Priority (TCP-LP), a distributed algorithm whose goal is | 558 | TCP Low Priority (TCP-LP), a distributed algorithm whose goal is |
559 | to utiliza only the excess network bandwidth as compared to the | 559 | to utilize only the excess network bandwidth as compared to the |
560 | ``fair share`` of bandwidth as targeted by TCP. | 560 | ``fair share`` of bandwidth as targeted by TCP. |
561 | See http://www-ece.rice.edu/networks/TCP-LP/ | 561 | See http://www-ece.rice.edu/networks/TCP-LP/ |
562 | 562 | ||
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index cfe5c8474286..cfb5d3de9c84 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/net/inet/arp.c | 1 | /* linux/net/ipv4/arp.c |
2 | * | 2 | * |
3 | * Version: $Id: arp.c,v 1.99 2001/08/30 22:55:42 davem Exp $ | 3 | * Version: $Id: arp.c,v 1.99 2001/08/30 22:55:42 davem Exp $ |
4 | * | 4 | * |
diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index c9820bfc493a..891b9355cf96 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig | |||
@@ -81,7 +81,7 @@ config IP_VS_PROTO_ESP | |||
81 | bool "ESP load balancing support" | 81 | bool "ESP load balancing support" |
82 | depends on IP_VS | 82 | depends on IP_VS |
83 | ---help--- | 83 | ---help--- |
84 | This option enables support for load balancing ESP (Encapsultion | 84 | This option enables support for load balancing ESP (Encapsulation |
85 | Security Payload) transport protocol. Say Y if unsure. | 85 | Security Payload) transport protocol. Say Y if unsure. |
86 | 86 | ||
87 | config IP_VS_PROTO_AH | 87 | config IP_VS_PROTO_AH |
@@ -204,7 +204,7 @@ config IP_VS_SED | |||
204 | connections to the server with the shortest expected delay. The | 204 | connections to the server with the shortest expected delay. The |
205 | expected delay that the job will experience is (Ci + 1) / Ui if | 205 | expected delay that the job will experience is (Ci + 1) / Ui if |
206 | sent to the ith server, in which Ci is the number of connections | 206 | sent to the ith server, in which Ci is the number of connections |
207 | on the the ith server and Ui is the fixed service rate (weight) | 207 | on the ith server and Ui is the fixed service rate (weight) |
208 | of the ith server. | 208 | of the ith server. |
209 | 209 | ||
210 | If you want to compile it in kernel, say Y. To compile it as a | 210 | If you want to compile it in kernel, say Y. To compile it as a |
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index a55b8ff70ded..d88c292f118c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
@@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG | |||
373 | daemon using netlink multicast sockets; unlike the LOG target | 373 | daemon using netlink multicast sockets; unlike the LOG target |
374 | which can only be viewed through syslog. | 374 | which can only be viewed through syslog. |
375 | 375 | ||
376 | The apropriate userspace logging daemon (ulogd) may be obtained from | 376 | The appropriate userspace logging daemon (ulogd) may be obtained from |
377 | <http://www.gnumonks.org/projects/ulogd/> | 377 | <http://www.gnumonks.org/projects/ulogd/> |
378 | 378 | ||
379 | To compile it as a module, choose M here. If unsure, say N. | 379 | To compile it as a module, choose M here. If unsure, say N. |