diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-08-16 10:15:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-16 12:09:17 +0200 |
| commit | b1c0356a58577ce0a583e3044bf801877fc0b5de (patch) | |
| tree | a5ed4452baf8a48fce1274b747228b842b18f377 /net/ipv6/ipv6_sockglue.c | |
| parent | inet: move inet->transparent to inet->inet_flags (diff) | |
| download | linux-b1c0356a58577ce0a583e3044bf801877fc0b5de.tar.xz linux-b1c0356a58577ce0a583e3044bf801877fc0b5de.zip | |
inet: move inet->is_icsk to inet->inet_flags
We move single bit fields to inet->inet_flags to avoid races.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index eb334122512c..d19577a94bcc 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -102,7 +102,7 @@ int ip6_ra_control(struct sock *sk, int sel) struct ipv6_txoptions *ipv6_update_options(struct sock *sk, struct ipv6_txoptions *opt) { - if (inet_sk(sk)->is_icsk) { + if (inet_test_bit(IS_ICSK, sk)) { if (opt && !((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) && inet_sk(sk)->inet_daddr != LOOPBACK4_IPV6) { @@ -831,7 +831,7 @@ done: goto e_inval; retv = -EPROTO; - if (inet_sk(sk)->is_icsk) + if (inet_test_bit(IS_ICSK, sk)) break; retv = -EFAULT; |