diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 17:06:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 17:06:58 -0400 |
| commit | a52cefc80fc92981592c688d1c8067442afe4cec (patch) | |
| tree | ad119b5a4f5e4a257779c0ef324b5c9354c915f1 /Documentation | |
| parent | fba956c46a72f9e7503fd464ffee43c632307e31 (diff) | |
| parent | 4acad72ded8e3f0211bd2a762e23c28229c61a51 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
[IPV6]: Consolidate the ip6_pol_route_(input|output) pair
[TCP]: Make snd_cwnd_cnt 32-bit
[TCP]: Update the /proc/net/tcp documentation
[NETNS]: Don't panic on creating the namespace's loopback
[NEIGH]: Ensure that pneigh_lookup is protected with RTNL
[INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
[ISDN]: Fix compile with CONFIG_ISDN_X25 disabled.
[IPV6]: Replace sk_buff ** with sk_buff * in input handlers
[SELINUX]: Update for netfilter ->hook() arg changes.
[INET]: Consolidate the xxx_put
[INET]: Small cleanup for xxx_put after evictor consolidation
[INET]: Consolidate the xxx_evictor
[INET]: Consolidate the xxx_frag_destroy
[INET]: Consolidate xxx_the secret_rebuild
[INET]: Consolidate the xxx_frag_kill
[INET]: Collect common frag sysctl variables together
[INET]: Collect frag queues management objects together
[INET]: Move common fields from frag_queues in one place.
[TG3]: Fix performance regression on 5705.
[ISDN]: Remove local copy of device name to make sure renames work.
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/proc_net_tcp.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/networking/proc_net_tcp.txt b/Documentation/networking/proc_net_tcp.txt index 5e21f7cb6383..4a79209e77a7 100644 --- a/Documentation/networking/proc_net_tcp.txt +++ b/Documentation/networking/proc_net_tcp.txt | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | This document describes the interfaces /proc/net/tcp and /proc/net/tcp6. | 1 | This document describes the interfaces /proc/net/tcp and /proc/net/tcp6. |
| 2 | Note that these interfaces are deprecated in favor of tcp_diag. | ||
| 2 | 3 | ||
| 3 | These /proc interfaces provide information about currently active TCP | 4 | These /proc interfaces provide information about currently active TCP |
| 4 | connections, and are implemented by tcp_get_info() in net/ipv4/tcp_ipv4.c and | 5 | connections, and are implemented by tcp4_seq_show() in net/ipv4/tcp_ipv4.c |
| 5 | tcp6_get_info() in net/ipv6/tcp_ipv6.c, respectively. | 6 | and tcp6_seq_show() in net/ipv6/tcp_ipv6.c, respectively. |
| 6 | 7 | ||
| 7 | It will first list all listening TCP sockets, and next list all established | 8 | It will first list all listening TCP sockets, and next list all established |
| 8 | TCP connections. A typical entry of /proc/net/tcp would look like this (split | 9 | TCP connections. A typical entry of /proc/net/tcp would look like this (split |