diff mbox

[v2,2/2] uapi: fix linux/rds.h userspace compilation error

Message ID 20170216150545.GE13804@altlinux.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dmitry V. Levin Feb. 16, 2017, 3:05 p.m. UTC
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>
---
v2: Cc'ed netdev

 include/uapi/linux/rds.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

David Miller Feb. 19, 2017, 11:16 p.m. UTC | #1
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 16 Feb 2017 18:05:45 +0300

> 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>

Applied.
diff mbox

Patch

diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index 3ff5cc2..804c9b2 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
 
@@ -223,7 +224,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;
 	__u64			cookie_addr;
 	__u64			flags;