diff options
| author |  Eric Dumazet <edumazet@google.com>
| 2024-05-07 16:41:40 +0000 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2024-05-09 20:25:55 -0700 |
| commit | 383eed2de529287337d9153a5084d4291a7c69f2 (patch) | |
| tree | c9777ab7de71b12a64be8e9c4ec188314b4b0d65 /net/ipv4 | |
| parent | net/sched: adjust device watchdog timer to detect stopped queue at right time (diff) | |
| download | linux-383eed2de529287337d9153a5084d4291a7c69f2.tar.gz linux-383eed2de529287337d9153a5084d4291a7c69f2.tar.bz2 linux-383eed2de529287337d9153a5084d4291a7c69f2.zip | |
tcp: get rid of twsk_unique()
DCCP is going away soon, and had no twsk_unique() method.
We can directly call tcp_twsk_unique() for TCP sockets.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240507164140.940547-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 3 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index cf88eca5f1b4..48d0d494185b 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -565,7 +565,8 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row, if (likely(inet_match(net, sk2, acookie, ports, dif, sdif))) { if (sk2->sk_state == TCP_TIME_WAIT) { tw = inet_twsk(sk2); - if (twsk_unique(sk, sk2, twp)) + if (sk->sk_protocol == IPPROTO_TCP && + tcp_twsk_unique(sk, sk2, twp)) break; } goto not_unique; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 95e3d28b83b8..108a438dc247 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2437,7 +2437,6 @@ do_time_wait: static struct timewait_sock_ops tcp_timewait_sock_ops = { .twsk_obj_size = sizeof(struct tcp_timewait_sock), - .twsk_unique = tcp_twsk_unique, .twsk_destructor= tcp_twsk_destructor, }; |