diff options
author | Eric Dumazet <edumazet@google.com> | 2023-08-16 11:15:45 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2023-08-16 13:09:18 +0300 |
commit | 08e39c0dfa29f233f5a621f7d274b793a080c769 (patch) | |
tree | 5edd6e05adc3042bbf121d2c62424e28759df625 /net/ipv4/af_inet.c | |
parent | ca571e2eb7eb6202aa367e01c811aab023272f38 (diff) | |
download | linux-08e39c0dfa29f233f5a621f7d274b793a080c769.tar.xz |
inet: move inet->defer_connect to inet->inet_flags
Make room in struct inet_sock by removing this bit field,
using one available bit in inet_flags instead.
Also move local_port_range to fill the resulting hole,
saving 8 bytes on 64bit arches.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 26e7cd9cb059..e07ee60625d9 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -656,7 +656,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, err = -EISCONN; goto out; case SS_CONNECTING: - if (inet_sk(sk)->defer_connect) + if (inet_test_bit(DEFER_CONNECT, sk)) err = is_sendmsg ? -EINPROGRESS : -EISCONN; else err = -EALREADY; @@ -679,7 +679,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, sock->state = SS_CONNECTING; - if (!err && inet_sk(sk)->defer_connect) + if (!err && inet_test_bit(DEFER_CONNECT, sk)) goto out; /* Just entered SS_CONNECTING state; the only |