Skip to content

Commit 6886c14

Browse files
Yajun DengPaolo Abeni
authored andcommitted
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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 1a629af commit 6886c14

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

net/core/sock.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,14 +820,11 @@ EXPORT_SYMBOL(sock_set_sndtimeo);
820820

821821
static void __sock_set_timestamps(struct sock *sk, bool val, bool new, bool ns)
822822
{
823+
sock_valbool_flag(sk, SOCK_RCVTSTAMP, val);
824+
sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, val && ns);
823825
if (val) {
824826
sock_valbool_flag(sk, SOCK_TSTAMP_NEW, new);
825-
sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, ns);
826-
sock_set_flag(sk, SOCK_RCVTSTAMP);
827827
sock_enable_timestamp(sk, SOCK_TIMESTAMP);
828-
} else {
829-
sock_reset_flag(sk, SOCK_RCVTSTAMP);
830-
sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
831828
}
832829
}
833830

0 commit comments

Comments
 (0)