Commit 44d8ab09 authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by Kleber Sacilotto de Souza

uapi: fix linux/rds.h userspace compilation error

BugLink: http://bugs.launchpad.net/bugs/1744639

[ Upstream commit 1786dbf3 ]

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: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent bee9b300
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#define _LINUX_RDS_H #define _LINUX_RDS_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h> /* For __kernel_sockaddr_storage. */
#define RDS_IB_ABI_VERSION 0x301 #define RDS_IB_ABI_VERSION 0x301
...@@ -223,7 +224,7 @@ struct rds_get_mr_args { ...@@ -223,7 +224,7 @@ struct rds_get_mr_args {
}; };
struct rds_get_mr_for_dest_args { struct rds_get_mr_for_dest_args {
struct sockaddr_storage dest_addr; struct __kernel_sockaddr_storage dest_addr;
struct rds_iovec vec; struct rds_iovec vec;
uint64_t cookie_addr; uint64_t cookie_addr;
uint64_t flags; uint64_t flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment