]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: use sock_valbool_flag() only in __sock_set_timestamps()
authorYajun Deng <yajun.deng@linux.dev>
Thu, 17 Oct 2024 13:34:35 +0000 (21:34 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Wed, 23 Oct 2024 08:06:24 +0000 (10:06 +0200)
sock_{,re}set_flag() are contained in sock_valbool_flag(),
it would be cleaner to just use sock_valbool_flag().

Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
Link: https://patch.msgid.link/20241017133435.2552-1-yajun.deng@linux.dev
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/core/sock.c

index 756f8e8e0ac76cda3d6202855f829b75a6f85219..7f398bd07fb791eedabce2a68ff2a7a6b296ba8c 100644 (file)
@@ -820,14 +820,11 @@ EXPORT_SYMBOL(sock_set_sndtimeo);
 
 static void __sock_set_timestamps(struct sock *sk, bool val, bool new, bool ns)
 {
+       sock_valbool_flag(sk, SOCK_RCVTSTAMP, val);
+       sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, val && ns);
        if (val)  {
                sock_valbool_flag(sk, SOCK_TSTAMP_NEW, new);
-               sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, ns);
-               sock_set_flag(sk, SOCK_RCVTSTAMP);
                sock_enable_timestamp(sk, SOCK_TIMESTAMP);
-       } else {
-               sock_reset_flag(sk, SOCK_RCVTSTAMP);
-               sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
        }
 }