Skip to content

Commit

Permalink
uapi: fix linux/rds.h userspace compilation error
Browse files Browse the repository at this point in the history
[ Upstream commit 1786dbf ]

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>
  • Loading branch information
Dmitry V. Levin authored and Greg Kroah-Hartman committed Nov 21, 2017
1 parent f5e303d commit 16e7973
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/uapi/linux/rds.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
uint64_t cookie_addr;
uint64_t flags;
Expand Down

0 comments on commit 16e7973

Please sign in to comment.