diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-04-03 19:26:16 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-03 19:26:16 -0700 |
commit | d20bac353be7f169b8b032ff6346d2fe608d8312 (patch) | |
tree | ff2abee2b5fd4ec8a9c22967bb598596555c6266 /net/ipv4/tcp_ipv4.c | |
parent | 2f3c7195a702178629575b637f3f9a91eabdab73 (diff) | |
parent | 19822a980e1956a6572998887a7df5a0607a32f6 (diff) |
Merge branch 'tcp-make-trace-of-reset-logic-complete'
Jason Xing says:
====================
tcp: make trace of reset logic complete
Before this, we miss some cases where the TCP layer could send RST but
we cannot trace it. So I decided to complete it :)
Link: https://lore.kernel.org/all/20240329034243.7929-1-kerneljasonxing@gmail.com/
====================
Link: https://lore.kernel.org/r/20240401073605.37335-1-kerneljasonxing@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 1e0a9762f92e..56b75efcfd12 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -866,11 +866,10 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) * routing might fail in this case. No choice here, if we choose to force * input interface, we will misroute in case of asymmetric route. */ - if (sk) { + if (sk) arg.bound_dev_if = sk->sk_bound_dev_if; - if (sk_fullsock(sk)) - trace_tcp_send_reset(sk, skb); - } + + trace_tcp_send_reset(sk, skb); BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) != offsetof(struct inet_timewait_sock, tw_bound_dev_if)); |