summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levin <alexander.levin@verizon.com>2017-11-13 18:03:32 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-21 09:23:28 +0100
commit3f0cc54226ca6e14ae855907253aa2674aea566b (patch)
tree6a9d92d4eaf4da7d8ba63e8ac0c22d061901d3a3
parentd8ce2b0874a762ccc2d68aecf7700b6003e13e87 (diff)
Revert "uapi: fix linux/rds.h userspace compilation errors"
This reverts commit ad50561ba7a664bc581826c9d57d137fcf17bfa5. There was a mixup with the commit message for two upstream commit that have the same subject line. This revert will be followed by the two commits with proper commit messages. 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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index 7af20a136429..0f9265cb2a96 100644
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -35,7 +35,6 @@
#define _LINUX_RDS_H
#include <linux/types.h>
-#include <linux/socket.h> /* For __kernel_sockaddr_storage. */
#define RDS_IB_ABI_VERSION 0x301
@@ -224,7 +223,7 @@ struct rds_get_mr_args {
};
struct rds_get_mr_for_dest_args {
- struct __kernel_sockaddr_storage dest_addr;
+ struct sockaddr_storage dest_addr;
struct rds_iovec vec;
uint64_t cookie_addr;
uint64_t flags;