aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/Kconfig4
-rw-r--r--net/ipv4/cipso_ipv4.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_sed.c2
-rw-r--r--net/ipv4/udp.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index e62aee0ec4c5..c68196cc56ab 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -130,7 +130,7 @@ config IP_ROUTE_MULTIPATH_RR
130 tristate "MULTIPATH: round robin algorithm" 130 tristate "MULTIPATH: round robin algorithm"
131 depends on IP_ROUTE_MULTIPATH_CACHED 131 depends on IP_ROUTE_MULTIPATH_CACHED
132 help 132 help
133 Mulitpath routes are chosen according to Round Robin 133 Multipath routes are chosen according to Round Robin
134 134
135config IP_ROUTE_MULTIPATH_RANDOM 135config IP_ROUTE_MULTIPATH_RANDOM
136 tristate "MULTIPATH: random algorithm" 136 tristate "MULTIPATH: random algorithm"
@@ -651,7 +651,7 @@ config TCP_MD5SIG
651 select CRYPTO 651 select CRYPTO
652 select CRYPTO_MD5 652 select CRYPTO_MD5
653 ---help--- 653 ---help---
654 RFC2385 specifices a method of giving MD5 protection to TCP sessions. 654 RFC2385 specifies a method of giving MD5 protection to TCP sessions.
655 Its main (only?) use is to protect BGP sessions between core routers 655 Its main (only?) use is to protect BGP sessions between core routers
656 on the Internet. 656 on the Internet.
657 657
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index e1f18489db1d..86a2b52aad38 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -629,7 +629,7 @@ doi_walk_return:
629 * @domain: the domain to add 629 * @domain: the domain to add
630 * 630 *
631 * Description: 631 * Description:
632 * Adds the @domain to the the DOI specified by @doi_def, this function 632 * Adds the @domain to the DOI specified by @doi_def, this function
633 * should only be called by external functions (i.e. NetLabel). This function 633 * should only be called by external functions (i.e. NetLabel). This function
634 * does allocate memory. Returns zero on success, negative values on failure. 634 * does allocate memory. Returns zero on success, negative values on failure.
635 * 635 *
diff --git a/net/ipv4/ipvs/ip_vs_sed.c b/net/ipv4/ipvs/ip_vs_sed.c
index ff366f7390d9..dd7c128f9db3 100644
--- a/net/ipv4/ipvs/ip_vs_sed.c
+++ b/net/ipv4/ipvs/ip_vs_sed.c
@@ -18,7 +18,7 @@
18 * The SED algorithm attempts to minimize each job's expected delay until 18 * The SED algorithm attempts to minimize each job's expected delay until
19 * completion. The expected delay that the job will experience is 19 * completion. The expected delay that the job will experience is
20 * (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of 20 * (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of
21 * jobs on the the ith server and Ui is the fixed service rate (weight) of 21 * jobs on the ith server and Ui is the fixed service rate (weight) of
22 * the ith server. The SED algorithm adopts a greedy policy that each does 22 * the ith server. The SED algorithm adopts a greedy policy that each does
23 * what is in its own best interest, i.e. to join the queue which would 23 * what is in its own best interest, i.e. to join the queue which would
24 * minimize its expected delay of completion. 24 * minimize its expected delay of completion.
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 113e0c4c8a92..66026df1cc76 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -983,7 +983,7 @@ int udp_disconnect(struct sock *sk, int flags)
983} 983}
984 984
985/* return: 985/* return:
986 * 1 if the the UDP system should process it 986 * 1 if the UDP system should process it
987 * 0 if we should drop this packet 987 * 0 if we should drop this packet
988 * -1 if it should get processed by xfrm4_rcv_encap 988 * -1 if it should get processed by xfrm4_rcv_encap
989 */ 989 */