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:21:23 +0100 |
| commit | f5e303d54ac2d739663643f52af4972f8955734d (patch) | |
| tree | 58751b42b2cfa8f5131a758f5310ba93671be649 | |
| parent | d9c8d4adb5a7466cf3000c3c7d7136be5376cf22 (diff) | |
| download | linux-stable-f5e303d54ac2d739663643f52af4972f8955734d.tar.gz linux-stable-f5e303d54ac2d739663643f52af4972f8955734d.tar.bz2 linux-stable-f5e303d54ac2d739663643f52af4972f8955734d.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 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; |