| From foo@baz Sun Nov 19 12:16:40 CET 2017 |
| From: "Dmitry V. Levin" <ldv@altlinux.org> |
| Date: Thu, 16 Feb 2017 18:05:45 +0300 |
| Subject: uapi: fix linux/rds.h userspace compilation error |
| |
| From: "Dmitry V. Levin" <ldv@altlinux.org> |
| |
| |
| [ 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> |
| --- |
| include/uapi/linux/rds.h | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- 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; |
