diff options
| author | Davide Caratti <dcaratti@redhat.com> | 2018-12-17 11:26:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-09 17:38:36 +0100 |
| commit | e4a2ffe9029fd3e40513b1949b225d180900ef4e (patch) | |
| tree | a49fa29cd93ee3e5a54c61765bbd4172179063e5 /include/uapi/linux | |
| parent | e15413d61d4e05f6d819fa165116b3d1781d2157 (diff) | |
| download | linux-stable-e4a2ffe9029fd3e40513b1949b225d180900ef4e.tar.gz linux-stable-e4a2ffe9029fd3e40513b1949b225d180900ef4e.tar.bz2 linux-stable-e4a2ffe9029fd3e40513b1949b225d180900ef4e.zip | |
net: Use __kernel_clockid_t in uapi net_stamp.h
[ Upstream commit e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 ]
Herton reports the following error when building a userspace program that
includes net_stamp.h:
In file included from foo.c:2:
/usr/include/linux/net_tstamp.h:158:2: error: unknown type name
‘clockid_t’
clockid_t clockid; /* reference clockid */
^~~~~~~~~
Fix it by using __kernel_clockid_t in place of clockid_t.
Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
Cc: Timothy Redaelli <tredaelli@redhat.com>
Reported-by: Herton R. Krzesinski <herton@redhat.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Tested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/net_tstamp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h index 97ff3c17ec4d..e5b39721c6e4 100644 --- a/include/uapi/linux/net_tstamp.h +++ b/include/uapi/linux/net_tstamp.h @@ -155,8 +155,8 @@ enum txtime_flags { }; struct sock_txtime { - clockid_t clockid; /* reference clockid */ - __u32 flags; /* as defined by enum txtime_flags */ + __kernel_clockid_t clockid;/* reference clockid */ + __u32 flags; /* as defined by enum txtime_flags */ }; #endif /* _NET_TIMESTAMPING_H */ |