diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-10-27 20:09:32 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-11-15 16:38:29 +0300 |
| commit | 0309f98f2fdc3526317e9bac150ca690f1f94ce6 (patch) | |
| tree | 47f59d2627735113e7ce37b9983670a4af7eed97 /include/uapi/linux/errqueue.h | |
| parent | 75d319c06e6a76f67549c0ae1007dc3167804f4e (diff) | |
| download | linux-0309f98f2fdc3526317e9bac150ca690f1f94ce6.tar.xz | |
y2038: socket: remove timespec reference in timestamping
In order to remove the 'struct timespec' definition and the
timespec64_to_timespec() helper function, change over the in-kernel
definition of 'struct scm_timestamping' to use the __kernel_old_timespec
replacement and open-code the assignment.
Acked-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/uapi/linux/errqueue.h')
| -rw-r--r-- | include/uapi/linux/errqueue.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index 28491dac074b..0cca19670fd2 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -37,9 +37,16 @@ struct sock_extended_err { * The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_* * communicate network timestamps by passing this struct in a cmsg with * recvmsg(). See Documentation/networking/timestamping.txt for details. + * User space sees a timespec definition that matches either + * __kernel_timespec or __kernel_old_timespec, in the kernel we + * require two structure definitions to provide both. */ struct scm_timestamping { +#ifdef __KERNEL__ + struct __kernel_old_timespec ts[3]; +#else struct timespec ts[3]; +#endif }; struct scm_timestamping64 { |