From: Daniel Zahka Date: Thu, 18 Sep 2025 15:52:04 +0000 (-0700) Subject: psp: don't use flags for checking sk_state X-Git-Tag: v6.18-rc1~132^2~107^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28bb24dadd0ed70aed43cf9af3a54c22c3ce04b2;p=thirdparty%2Flinux.git psp: don't use flags for checking sk_state Using flags to check sk_state only makes sense to check for a subset of states in parallel e.g. sk_fullsock(). We are not doing that here. Compare for individual states directly. Signed-off-by: Daniel Zahka Link: https://patch.msgid.link/20250918155205.2197603-4-daniel.zahka@gmail.com Signed-off-by: Jakub Kicinski --- diff --git a/include/net/psp/functions.h b/include/net/psp/functions.h index 980de7e58f8ae..ef7743664da39 100644 --- a/include/net/psp/functions.h +++ b/include/net/psp/functions.h @@ -129,11 +129,11 @@ static inline struct psp_assoc *psp_sk_get_assoc_rcu(const struct sock *sk) struct psp_assoc *pas; int state; - state = 1 << READ_ONCE(sk->sk_state); - if (!sk_is_inet(sk) || state & TCPF_NEW_SYN_RECV) + state = READ_ONCE(sk->sk_state); + if (!sk_is_inet(sk) || state == TCP_NEW_SYN_RECV) return NULL; - pas = state & TCPF_TIME_WAIT ? + pas = state == TCP_TIME_WAIT ? rcu_dereference(inet_twsk(sk)->psp_assoc) : rcu_dereference(sk->psp_assoc); return pas;