diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2017-11-12 19:37:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-14 23:50:13 -0500 |
commit | 0eef304bc9f7d079a1165e8cd2f24b078e9e1f2a (patch) | |
tree | c1b41f1ed2891c050d21f3f8cc32ba719e20f8da | |
parent | 4497478c60c04d2bf37082e27fc98f4f835db96b (diff) |
uapi: fix linux/rxrpc.h userspace compilation errors
Consistently use types provided by <linux/types.h> to fix the following
linux/rxrpc.h userspace compilation errors:
/usr/include/linux/rxrpc.h:24:2: error: unknown type name 'u16'
u16 srx_service; /* service desired */
/usr/include/linux/rxrpc.h:25:2: error: unknown type name 'u16'
u16 transport_type; /* type of transport socket (SOCK_DGRAM) */
/usr/include/linux/rxrpc.h:26:2: error: unknown type name 'u16'
u16 transport_len; /* length of transport address */
Use __kernel_sa_family_t instead of sa_family_t the same way
as uapi/linux/in.h does, to fix the following
linux/rxrpc.h userspace compilation errors:
/usr/include/linux/rxrpc.h:23:2: error: unknown type name 'sa_family_t'
sa_family_t srx_family; /* address family */
/usr/include/linux/rxrpc.h:28:3: error: unknown type name 'sa_family_t'
sa_family_t family; /* transport address family */
Fixes: 727f8914477e ("rxrpc: Expose UAPI definitions to userspace")
Cc: <stable@vger.kernel.org> # v4.14
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/uapi/linux/rxrpc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h index 9656aad8f8f7..9d4afea308a4 100644 --- a/include/uapi/linux/rxrpc.h +++ b/include/uapi/linux/rxrpc.h | |||
@@ -20,12 +20,12 @@ | |||
20 | * RxRPC socket address | 20 | * RxRPC socket address |
21 | */ | 21 | */ |
22 | struct sockaddr_rxrpc { | 22 | struct sockaddr_rxrpc { |
23 | sa_family_t srx_family; /* address family */ | 23 | __kernel_sa_family_t srx_family; /* address family */ |
24 | u16 srx_service; /* service desired */ | 24 | __u16 srx_service; /* service desired */ |
25 | u16 transport_type; /* type of transport socket (SOCK_DGRAM) */ | 25 | __u16 transport_type; /* type of transport socket (SOCK_DGRAM) */ |
26 | u16 transport_len; /* length of transport address */ | 26 | __u16 transport_len; /* length of transport address */ |
27 | union { | 27 | union { |
28 | sa_family_t family; /* transport address family */ | 28 | __kernel_sa_family_t family; /* transport address family */ |
29 | struct sockaddr_in sin; /* IPv4 transport address */ | 29 | struct sockaddr_in sin; /* IPv4 transport address */ |
30 | struct sockaddr_in6 sin6; /* IPv6 transport address */ | 30 | struct sockaddr_in6 sin6; /* IPv6 transport address */ |
31 | } transport; | 31 | } transport; |