diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-20 14:00:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-20 14:00:26 -0500 |
| commit | b2597f78d4831f2be288b220fcce5c4a9a63abec (patch) | |
| tree | 503a12a1a7357e7b0935fa321ae878a850febb3c /net/ipv6/tcp_ipv6.c | |
| parent | netdevsim: correctly check return value of debugfs_create_dir (diff) | |
| parent | net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition (diff) | |
| download | linux-dev-b2597f78d4831f2be288b220fcce5c4a9a63abec.tar.xz linux-dev-b2597f78d4831f2be288b220fcce5c4a9a63abec.zip | |
Merge branch 'replace-tcp_set_state-tracepoint-with-inet_sock_set_state'
Yafang Shao says:
====================
replace tcp_set_state tracepoint with inet_sock_set_state
According to the discussion in the mail thread
https://patchwork.kernel.org/patch/10099243/,
tcp_set_state tracepoint is renamed to inet_sock_set_state tracepoint and is
moved to include/trace/events/sock.h.
With this new tracepoint, we can trace AF_INET/AF_INET6 sock state transitions.
As there's only one single tracepoint for inet, so I didn't create a new trace
file named trace/events/inet_sock.h, and just place it in
include/trace/events/sock.h
Currently TCP/DCCP/SCTP state transitions are traced with this tracepoint.
- Why not more protocol ?
If we really think that anonter protocol should be traced, I will modify the
code to trace it.
I just want to make the code easy and not output useless information.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 7178476b3d2f..aa12a26a96c6 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1795,7 +1795,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) timer_expires = jiffies; } - state = sk_state_load(sp); + state = inet_sk_state_load(sp); if (state == TCP_LISTEN) rx_queue = sp->sk_ack_backlog; else |