diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-10-25 22:04:46 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-11-15 14:38:29 +0100 |
commit | df1b4ba9d4a8454285c53c2ec7224228105bc5c8 (patch) | |
tree | a0880e0feaa26205a164e97c123b2f3856ec9e9e /net/socket.c | |
parent | 0309f98f2fdc3526317e9bac150ca690f1f94ce6 (diff) | |
download | linux-df1b4ba9d4a8454285c53c2ec7224228105bc5c8.tar.gz linux-df1b4ba9d4a8454285c53c2ec7224228105bc5c8.tar.bz2 linux-df1b4ba9d4a8454285c53c2ec7224228105bc5c8.zip |
y2038: socket: use __kernel_old_timespec instead of timespec
The 'timespec' type definition and helpers like ktime_to_timespec()
or timespec64_to_timespec() should no longer be used in the kernel so
we can remove them and avoid introducing y2038 issues in new code.
Change the socket code that needs to pass a timespec to user space for
backward compatibility to use __kernel_old_timespec instead. This type
has the same layout but with a clearer defined name.
Slightly reformat tcp_recv_timestamp() for consistency after the removal
of timespec64_to_timespec().
Acked-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 98f6544b0096..9ab00a080760 100644 --- a/net/socket.c +++ b/net/socket.c @@ -793,7 +793,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_NEW, sizeof(ts), &ts); } else { - struct timespec ts; + struct __kernel_old_timespec ts; skb_get_timestampns(skb, &ts); put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD, |