diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2017-02-16 18:05:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:01:07 +0100 |
| commit | 12c50a1f5746e803d5e661ab8bfe0f870e8ce2e2 (patch) | |
| tree | 126dff029b2e60f992656fe0d8d9855cd8404093 | |
| parent | fb75ce8dc5811d5c19919f94079118997838d8d3 (diff) | |
| download | linux-stable-12c50a1f5746e803d5e661ab8bfe0f870e8ce2e2.tar.gz linux-stable-12c50a1f5746e803d5e661ab8bfe0f870e8ce2e2.tar.bz2 linux-stable-12c50a1f5746e803d5e661ab8bfe0f870e8ce2e2.zip | |
uapi: fix linux/rds.h userspace compilation error
[ Upstream commit 1786dbf3702e33ce3afd2d3dbe630bd04b1d2e58 ]
On the kernel side, sockaddr_storage is #define'd to
__kernel_sockaddr_storage. Replacing struct sockaddr_storage with
struct __kernel_sockaddr_storage defined by <linux/socket.h> fixes
the following linux/rds.h userspace compilation error:
/usr/include/linux/rds.h:226:26: error: field 'dest_addr' has incomplete type
struct sockaddr_storage dest_addr;
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | include/uapi/linux/rds.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h index 91950950aa59..25e865320288 100644 --- a/include/uapi/linux/rds.h +++ b/include/uapi/linux/rds.h @@ -35,6 +35,7 @@ #define _LINUX_RDS_H #include <linux/types.h> +#include <linux/socket.h> /* For __kernel_sockaddr_storage. */ #define RDS_IB_ABI_VERSION 0x301 @@ -213,7 +214,7 @@ struct rds_get_mr_args { }; struct rds_get_mr_for_dest_args { - struct sockaddr_storage dest_addr; + struct __kernel_sockaddr_storage dest_addr; struct rds_iovec vec; uint64_t cookie_addr; uint64_t flags; |