diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:32 +0000 |
| commit | 249acb5f47df27109d74a0d904a5da56c8bac28f (patch) | |
| tree | bade04b7c88324eaf6f826dd69a10146edd9a819 /include/uapi/linux/errqueue.h | |
| parent | 9384d0e6facc9f5b325a2d401e9ed6bb49507a2a (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| download | cachepc-linux-249acb5f47df27109d74a0d904a5da56c8bac28f.tar.gz cachepc-linux-249acb5f47df27109d74a0d904a5da56c8bac28f.zip | |
Merge tag 'v5.1-rc1' into spi-5.2
Linux 5.1-rc1
Diffstat (limited to 'include/uapi/linux/errqueue.h')
| -rw-r--r-- | include/uapi/linux/errqueue.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index c0151200f7d1..28491dac074b 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -3,6 +3,7 @@ #define _UAPI_LINUX_ERRQUEUE_H #include <linux/types.h> +#include <linux/time_types.h> struct sock_extended_err { __u32 ee_errno; @@ -41,6 +42,10 @@ struct scm_timestamping { struct timespec ts[3]; }; +struct scm_timestamping64 { + struct __kernel_timespec ts[3]; +}; + /* The type of scm_timestamping, passed in sock_extended_err ee_info. * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0] * is zero, then this is a hardware timestamp and recorded in ts[2]. |