diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/decnet/af_decnet.c | 2 | ||||
-rw-r--r-- | net/ipv4/Kconfig | 4 | ||||
-rw-r--r-- | net/ipv4/cipso_ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_sed.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 | ||||
-rw-r--r-- | net/ipv6/netfilter/Kconfig | 2 | ||||
-rw-r--r-- | net/llc/af_llc.c | 2 | ||||
-rw-r--r-- | net/netfilter/Kconfig | 2 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 2 | ||||
-rw-r--r-- | net/sctp/chunk.c | 2 | ||||
-rw-r--r-- | net/sctp/socket.c | 4 | ||||
-rw-r--r-- | net/sunrpc/svcauth.c | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 9fbe87c93802..bfa910b6ad25 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -1839,7 +1839,7 @@ static inline int dn_queue_too_long(struct dn_scp *scp, struct sk_buff_head *que | |||
1839 | } | 1839 | } |
1840 | 1840 | ||
1841 | /* | 1841 | /* |
1842 | * The DECnet spec requires the the "routing layer" accepts packets which | 1842 | * The DECnet spec requires that the "routing layer" accepts packets which |
1843 | * are at least 230 bytes in size. This excludes any headers which the NSP | 1843 | * are at least 230 bytes in size. This excludes any headers which the NSP |
1844 | * layer might add, so we always assume that we'll be using the maximal | 1844 | * layer might add, so we always assume that we'll be using the maximal |
1845 | * length header on data packets. The variation in length is due to the | 1845 | * length header on data packets. The variation in length is due to the |
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 | ||
135 | config IP_ROUTE_MULTIPATH_RANDOM | 135 | config 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 | */ |
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index bbe99f842f9f..838b8ddee8c0 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig | |||
@@ -28,7 +28,7 @@ config IP6_NF_QUEUE | |||
28 | packets which enables users to receive the filtered packets | 28 | packets which enables users to receive the filtered packets |
29 | with QUEUE target using libipq. | 29 | with QUEUE target using libipq. |
30 | 30 | ||
31 | THis option enables the old IPv6-only "ip6_queue" implementation | 31 | This option enables the old IPv6-only "ip6_queue" implementation |
32 | which has been obsoleted by the new "nfnetlink_queue" code (see | 32 | which has been obsoleted by the new "nfnetlink_queue" code (see |
33 | CONFIG_NETFILTER_NETLINK_QUEUE). | 33 | CONFIG_NETFILTER_NETLINK_QUEUE). |
34 | 34 | ||
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 7d9fa38b6a7d..6b8a103cf9e6 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -324,7 +324,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) | |||
324 | memset(&laddr, 0, sizeof(laddr)); | 324 | memset(&laddr, 0, sizeof(laddr)); |
325 | memset(&daddr, 0, sizeof(daddr)); | 325 | memset(&daddr, 0, sizeof(daddr)); |
326 | /* | 326 | /* |
327 | * FIXME: check if the the address is multicast, | 327 | * FIXME: check if the address is multicast, |
328 | * only SOCK_DGRAM can do this. | 328 | * only SOCK_DGRAM can do this. |
329 | */ | 329 | */ |
330 | memcpy(laddr.mac, addr->sllc_mac, IFHWADDRLEN); | 330 | memcpy(laddr.mac, addr->sllc_mac, IFHWADDRLEN); |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index ea6211cade0a..a567dae8e5fd 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -197,7 +197,7 @@ config NF_CONNTRACK_PPTP | |||
197 | 197 | ||
198 | Please note that not all PPTP modes of operation are supported yet. | 198 | Please note that not all PPTP modes of operation are supported yet. |
199 | Specifically these limitations exist: | 199 | Specifically these limitations exist: |
200 | - Blindy assumes that control connections are always established | 200 | - Blindly assumes that control connections are always established |
201 | in PNS->PAC direction. This is a violation of RFC2637. | 201 | in PNS->PAC direction. This is a violation of RFC2637. |
202 | - Only supports a single call within each session | 202 | - Only supports a single call within each session |
203 | 203 | ||
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index c31af29a4439..117cbfdb910c 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c | |||
@@ -177,7 +177,7 @@ void nf_conntrack_unexpect_related(struct nf_conntrack_expect *exp) | |||
177 | struct nf_conntrack_expect *i; | 177 | struct nf_conntrack_expect *i; |
178 | 178 | ||
179 | write_lock_bh(&nf_conntrack_lock); | 179 | write_lock_bh(&nf_conntrack_lock); |
180 | /* choose the the oldest expectation to evict */ | 180 | /* choose the oldest expectation to evict */ |
181 | list_for_each_entry_reverse(i, &nf_conntrack_expect_list, list) { | 181 | list_for_each_entry_reverse(i, &nf_conntrack_expect_list, list) { |
182 | if (expect_matches(i, exp) && del_timer(&i->timeout)) { | 182 | if (expect_matches(i, exp) && del_timer(&i->timeout)) { |
183 | nf_ct_unlink_expect(i); | 183 | nf_ct_unlink_expect(i); |
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 83ef411772f4..77fb7b06a9c4 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * This file is part of the SCTP kernel reference Implementation | 4 | * This file is part of the SCTP kernel reference Implementation |
5 | * | 5 | * |
6 | * This file contains the code relating the the chunk abstraction. | 6 | * This file contains the code relating the chunk abstraction. |
7 | * | 7 | * |
8 | * The SCTP reference implementation is free software; | 8 | * The SCTP reference implementation is free software; |
9 | * you can redistribute it and/or modify it under the terms of | 9 | * you can redistribute it and/or modify it under the terms of |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9f1a908776de..83a76ba9d7b3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -2586,7 +2586,7 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, int opt | |||
2586 | * | 2586 | * |
2587 | * 7.1.2 SCTP_ASSOCINFO | 2587 | * 7.1.2 SCTP_ASSOCINFO |
2588 | * | 2588 | * |
2589 | * This option is used to tune the the maximum retransmission attempts | 2589 | * This option is used to tune the maximum retransmission attempts |
2590 | * of the association. | 2590 | * of the association. |
2591 | * Returns an error if the new association retransmission value is | 2591 | * Returns an error if the new association retransmission value is |
2592 | * greater than the sum of the retransmission value of the peer. | 2592 | * greater than the sum of the retransmission value of the peer. |
@@ -4547,7 +4547,7 @@ static int sctp_getsockopt_rtoinfo(struct sock *sk, int len, | |||
4547 | * | 4547 | * |
4548 | * 7.1.2 SCTP_ASSOCINFO | 4548 | * 7.1.2 SCTP_ASSOCINFO |
4549 | * | 4549 | * |
4550 | * This option is used to tune the the maximum retransmission attempts | 4550 | * This option is used to tune the maximum retransmission attempts |
4551 | * of the association. | 4551 | * of the association. |
4552 | * Returns an error if the new association retransmission value is | 4552 | * Returns an error if the new association retransmission value is |
4553 | * greater than the sum of the retransmission value of the peer. | 4553 | * greater than the sum of the retransmission value of the peer. |
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index f5c3808bf85a..af7c5f05c6e1 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c | |||
@@ -64,7 +64,7 @@ int svc_set_client(struct svc_rqst *rqstp) | |||
64 | } | 64 | } |
65 | 65 | ||
66 | /* A request, which was authenticated, has now executed. | 66 | /* A request, which was authenticated, has now executed. |
67 | * Time to finalise the the credentials and verifier | 67 | * Time to finalise the credentials and verifier |
68 | * and release and resources | 68 | * and release and resources |
69 | */ | 69 | */ |
70 | int svc_authorise(struct svc_rqst *rqstp) | 70 | int svc_authorise(struct svc_rqst *rqstp) |