diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
| commit | 127470597b6b9466872d9794a80804ec95fff8ea (patch) | |
| tree | b0087938a7f980c5b3d3879e0c2d18bab45d78e8 /include/uapi/linux/errqueue.h | |
| parent | ASoC: topology: create tlv before soc_tplg_init_kcontrol (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
Merge tag 'v5.1-rc1' into asoc-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]. |