From: Sasha Levin <alexander.levin@verizon.com>
Date: Mon, 13 Nov 2017 23:03:32 +0000 (-0500)
Subject: Revert "uapi: fix linux/rds.h userspace compilation errors"
X-Git-Tag: v3.18.83~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb75ce8dc5811d5c19919f94079118997838d8d3;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index 25e8653202889..91950950aa598 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;