From: Yajun Deng <yajun.deng@linux.dev>
Date: Thu, 17 Oct 2024 13:34:35 +0000 (+0800)
Subject: net: use sock_valbool_flag() only in __sock_set_timestamps()
X-Git-Tag: v6.13-rc1~135^2~242
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6886c14bdc309fa1c92b22f9587c5ca78f1920b7;p=thirdparty%2Fkernel%2Flinux.git

net: use sock_valbool_flag() only in __sock_set_timestamps()

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>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index 756f8e8e0ac76..7f398bd07fb79 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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);
 	}
 }