diff options
-rw-r--r-- | include/net/tcp.h | 6 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a6e0355921e1..813042c08dc5 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1716,12 +1716,6 @@ static inline bool tcp_rtx_and_write_queues_empty(const struct sock *sk) | |||
1716 | return tcp_rtx_queue_empty(sk) && tcp_write_queue_empty(sk); | 1716 | return tcp_rtx_queue_empty(sk) && tcp_write_queue_empty(sk); |
1717 | } | 1717 | } |
1718 | 1718 | ||
1719 | static inline void tcp_check_send_head(struct sock *sk, struct sk_buff *skb_unlinked) | ||
1720 | { | ||
1721 | if (tcp_write_queue_empty(sk)) | ||
1722 | tcp_chrono_stop(sk, TCP_CHRONO_BUSY); | ||
1723 | } | ||
1724 | |||
1725 | static inline void __tcp_add_write_queue_tail(struct sock *sk, struct sk_buff *skb) | 1719 | static inline void __tcp_add_write_queue_tail(struct sock *sk, struct sk_buff *skb) |
1726 | { | 1720 | { |
1727 | __skb_queue_tail(&sk->sk_write_queue, skb); | 1721 | __skb_queue_tail(&sk->sk_write_queue, skb); |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 769508c75dce..e2fa6eb9f81a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1412,7 +1412,8 @@ do_fault: | |||
1412 | /* It is the one place in all of TCP, except connection | 1412 | /* It is the one place in all of TCP, except connection |
1413 | * reset, where we can be unlinking the send_head. | 1413 | * reset, where we can be unlinking the send_head. |
1414 | */ | 1414 | */ |
1415 | tcp_check_send_head(sk, skb); | 1415 | if (tcp_write_queue_empty(sk)) |
1416 | tcp_chrono_stop(sk, TCP_CHRONO_BUSY); | ||
1416 | sk_wmem_free_skb(sk, skb); | 1417 | sk_wmem_free_skb(sk, skb); |
1417 | } | 1418 | } |
1418 | 1419 | ||