diff options
| author | Sasha Levin <alexander.levin@verizon.com> | 2017-11-13 18:03:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:01:07 +0100 |
| commit | fb75ce8dc5811d5c19919f94079118997838d8d3 (patch) | |
| tree | d4e8d6abe155943c21926f4471d27f51652aac55 | |
| parent | 83c47200d062b1bc679d4c82d439d9db8c8089f3 (diff) | |
| download | linux-stable-fb75ce8dc5811d5c19919f94079118997838d8d3.tar.gz linux-stable-fb75ce8dc5811d5c19919f94079118997838d8d3.tar.bz2 linux-stable-fb75ce8dc5811d5c19919f94079118997838d8d3.zip | |
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.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h index 25e865320288..91950950aa59 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 @@ -214,7 +213,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; |