summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChristian Eggers <ceggers@arri.de>2020-10-12 11:35:42 +0200
committerJakub Kicinski <kuba@kernel.org>2020-10-13 17:18:18 -0700
commit4e3bbb33e6f36e4b05be1b1b9b02e3dd5aaa3e69 (patch)
tree06bc99e90c51a427b82ad899feb315e255c2aa08 /net
parent59e611a566e7cd48cf54b6777a11fe3f9c2f9db5 (diff)
downloadlinux-4e3bbb33e6f36e4b05be1b1b9b02e3dd5aaa3e69.tar.bz2
socket: don't clear SOCK_TSTAMP_NEW when SO_TIMESTAMPNS is disabled
SOCK_TSTAMP_NEW (timespec64 instead of timespec) is also used for hardware time stamps (configured via SO_TIMESTAMPING_NEW). User space (ptp4l) first configures hardware time stamping via SO_TIMESTAMPING_NEW which sets SOCK_TSTAMP_NEW. In the next step, ptp4l disables SO_TIMESTAMPNS(_NEW) (software time stamps), but this must not switch hardware time stamps back to "32 bit mode". This problem happens on 32 bit platforms were the libc has already switched to struct timespec64 (from SO_TIMExxx_OLD to SO_TIMExxx_NEW socket options). ptp4l complains with "missing timestamp on transmitted peer delay request" because the wrong format is received (and discarded). Fixes: 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW") Fixes: 783da70e8396 ("net: add sock_enable_timestamps") Signed-off-by: Christian Eggers <ceggers@arri.de> Acked-by: Willem de Bruijn <willemb@google.com> Acked-by: Deepa Dinamani <deepa.kernel@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index dfe5d8047850..40a95e0c4bad 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -769,7 +769,6 @@ static void __sock_set_timestamps(struct sock *sk, bool val, bool new, bool ns)
} else {
sock_reset_flag(sk, SOCK_RCVTSTAMP);
sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
- sock_reset_flag(sk, SOCK_TSTAMP_NEW);
}
}