diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/Kconfig | 4 | ||||
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/dccp/Kconfig | 4 | ||||
-rw-r--r-- | net/decnet/dn_dev.c | 2 | ||||
-rw-r--r-- | net/ipv4/Kconfig | 4 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 2 | ||||
-rw-r--r-- | net/ipv6/af_inet6.c | 2 | ||||
-rw-r--r-- | net/sched/Kconfig | 2 |
8 files changed, 14 insertions, 8 deletions
diff --git a/net/Kconfig b/net/Kconfig index 55fd82e9ffd9..5e203b558703 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -247,7 +247,9 @@ config NET_TCPPROBE | |||
247 | what was just said, you don't need it: say N. | 247 | what was just said, you don't need it: say N. |
248 | 248 | ||
249 | Documentation on how to use TCP connection probing can be found | 249 | Documentation on how to use TCP connection probing can be found |
250 | at http://linux-net.osdl.org/index.php/TcpProbe | 250 | at: |
251 | |||
252 | http://www.linuxfoundation.org/collaborate/workgroups/networking/tcpprobe | ||
251 | 253 | ||
252 | To compile this code as a module, choose M here: the | 254 | To compile this code as a module, choose M here: the |
253 | module will be called tcp_probe. | 255 | module will be called tcp_probe. |
diff --git a/net/core/dev.c b/net/core/dev.c index 0dd54a69dace..126694116852 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -6096,7 +6096,7 @@ static void __net_exit default_device_exit(struct net *net) | |||
6096 | static void __net_exit default_device_exit_batch(struct list_head *net_list) | 6096 | static void __net_exit default_device_exit_batch(struct list_head *net_list) |
6097 | { | 6097 | { |
6098 | /* At exit all network devices most be removed from a network | 6098 | /* At exit all network devices most be removed from a network |
6099 | * namespace. Do this in the reverse order of registeration. | 6099 | * namespace. Do this in the reverse order of registration. |
6100 | * Do this across as many network namespaces as possible to | 6100 | * Do this across as many network namespaces as possible to |
6101 | * improve batching efficiency. | 6101 | * improve batching efficiency. |
6102 | */ | 6102 | */ |
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig index ad6dffd9070e..b75968a04017 100644 --- a/net/dccp/Kconfig +++ b/net/dccp/Kconfig | |||
@@ -49,7 +49,9 @@ config NET_DCCPPROBE | |||
49 | what was just said, you don't need it: say N. | 49 | what was just said, you don't need it: say N. |
50 | 50 | ||
51 | Documentation on how to use DCCP connection probing can be found | 51 | Documentation on how to use DCCP connection probing can be found |
52 | at http://linux-net.osdl.org/index.php/DccpProbe | 52 | at: |
53 | |||
54 | http://www.linuxfoundation.org/collaborate/workgroups/networking/dccpprobe | ||
53 | 55 | ||
54 | To compile this code as a module, choose M here: the | 56 | To compile this code as a module, choose M here: the |
55 | module will be called dccp_probe. | 57 | module will be called dccp_probe. |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 4c409b46aa35..9b73e0b03e34 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -1112,7 +1112,7 @@ static struct dn_dev *dn_dev_create(struct net_device *dev, int *err) | |||
1112 | /* | 1112 | /* |
1113 | * This processes a device up event. We only start up | 1113 | * This processes a device up event. We only start up |
1114 | * the loopback device & ethernet devices with correct | 1114 | * the loopback device & ethernet devices with correct |
1115 | * MAC addreses automatically. Others must be started | 1115 | * MAC addresses automatically. Others must be started |
1116 | * specifically. | 1116 | * specifically. |
1117 | * | 1117 | * |
1118 | * FIXME: How should we configure the loopback address ? If we could dispense | 1118 | * FIXME: How should we configure the loopback address ? If we could dispense |
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 9e95d7fb6d5a..a5a1050595d1 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -432,7 +432,9 @@ config INET_DIAG | |||
432 | ---help--- | 432 | ---help--- |
433 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by | 433 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by |
434 | native Linux tools such as ss. ss is included in iproute2, currently | 434 | native Linux tools such as ss. ss is included in iproute2, currently |
435 | downloadable at <http://linux-net.osdl.org/index.php/Iproute2>. | 435 | downloadable at: |
436 | |||
437 | http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 | ||
436 | 438 | ||
437 | If unsure, say Y. | 439 | If unsure, say Y. |
438 | 440 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 61c2463e2753..8750d4050b48 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1338,7 +1338,7 @@ static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, | |||
1338 | return 0; | 1338 | return 0; |
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | /* Intialize TSO state of a skb. | 1341 | /* Initialize TSO state of a skb. |
1342 | * This must be invoked the first time we consider transmitting | 1342 | * This must be invoked the first time we consider transmitting |
1343 | * SKB onto the wire. | 1343 | * SKB onto the wire. |
1344 | */ | 1344 | */ |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 54e8e42f7a88..0935c5a42b1f 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -300,7 +300,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
300 | goto out; | 300 | goto out; |
301 | } | 301 | } |
302 | 302 | ||
303 | /* Reproduce AF_INET checks to make the bindings consitant */ | 303 | /* Reproduce AF_INET checks to make the bindings consistent */ |
304 | v4addr = addr->sin6_addr.s6_addr32[3]; | 304 | v4addr = addr->sin6_addr.s6_addr32[3]; |
305 | chk_addr_ret = inet_addr_type(net, v4addr); | 305 | chk_addr_ret = inet_addr_type(net, v4addr); |
306 | if (!sysctl_ip_nonlocal_bind && | 306 | if (!sysctl_ip_nonlocal_bind && |
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index a36270a994d7..f04d4a484d53 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
@@ -24,7 +24,7 @@ menuconfig NET_SCHED | |||
24 | To administer these schedulers, you'll need the user-level utilities | 24 | To administer these schedulers, you'll need the user-level utilities |
25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. | 25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. |
26 | That package also contains some documentation; for more, check out | 26 | That package also contains some documentation; for more, check out |
27 | <http://linux-net.osdl.org/index.php/Iproute2>. | 27 | <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>. |
28 | 28 | ||
29 | This Quality of Service (QoS) support will enable you to use | 29 | This Quality of Service (QoS) support will enable you to use |
30 | Differentiated Services (diffserv) and Resource Reservation Protocol | 30 | Differentiated Services (diffserv) and Resource Reservation Protocol |