diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-03 07:04:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-03 07:04:47 -0700 |
| commit | fc86e52281ffd5c124f03de495fd52b7c67da491 (patch) | |
| tree | 9601b4c1d7f29752a50235bed2e5d3ad14c47f44 /include/uapi | |
| parent | 3c586a777ba008573158f6c41e93bf2d5f646054 (diff) | |
| parent | dbad9b8f72fbdf29b2d5f4a3b6be928e02f52862 (diff) | |
Merge "Merge android-4.4@89074de (v4.4.94) into msm-4.4"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/mroute6.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/rds.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index ce91215cf7e6..e0b566dc72ef 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -3,6 +3,7 @@ #include <linux/types.h> #include <linux/sockios.h> +#include <linux/in6.h> /* For struct sockaddr_in6. */ /* * Based on the MROUTING 3.5 defines primarily to keep diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h index 0f9265cb2a96..7af20a136429 100644 --- a/include/uapi/linux/rds.h +++ b/include/uapi/linux/rds.h @@ -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 @@ -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; |