aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c470fec9062f..d408fb41c804 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -283,8 +283,6 @@
283#include <asm/ioctls.h> 283#include <asm/ioctls.h>
284#include <net/busy_poll.h> 284#include <net/busy_poll.h>
285 285
286#include <trace/events/tcp.h>
287
288struct percpu_counter tcp_orphan_count; 286struct percpu_counter tcp_orphan_count;
289EXPORT_SYMBOL_GPL(tcp_orphan_count); 287EXPORT_SYMBOL_GPL(tcp_orphan_count);
290 288
@@ -2040,8 +2038,6 @@ void tcp_set_state(struct sock *sk, int state)
2040{ 2038{
2041 int oldstate = sk->sk_state; 2039 int oldstate = sk->sk_state;
2042 2040
2043 trace_tcp_set_state(sk, oldstate, state);
2044
2045 switch (state) { 2041 switch (state) {
2046 case TCP_ESTABLISHED: 2042 case TCP_ESTABLISHED:
2047 if (oldstate != TCP_ESTABLISHED) 2043 if (oldstate != TCP_ESTABLISHED)
@@ -2065,7 +2061,7 @@ void tcp_set_state(struct sock *sk, int state)
2065 /* Change state AFTER socket is unhashed to avoid closed 2061 /* Change state AFTER socket is unhashed to avoid closed
2066 * socket sitting in hash tables. 2062 * socket sitting in hash tables.
2067 */ 2063 */
2068 sk_state_store(sk, state); 2064 inet_sk_state_store(sk, state);
2069 2065
2070#ifdef STATE_TRACE 2066#ifdef STATE_TRACE
2071 SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n", sk, statename[oldstate], statename[state]); 2067 SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n", sk, statename[oldstate], statename[state]);