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/ipv6/inet6_hashtables.c | |
| parent | 33fb988b67050d9bb512f77f08453fa00088943c (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/ipv6/inet6_hashtables.c')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 2e81383b663b..6db71bb1cd30 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -21,6 +21,7 @@ #include <net/secure_seq.h> #include <net/ip.h> #include <net/sock_reuseport.h> +#include <net/tcp.h> u32 inet6_ehashfn(const struct net *net, const struct in6_addr *laddr, const u16 lport, @@ -289,7 +290,8 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, 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; |