diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-10-25 03:51:11 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-10-25 03:51:11 (GMT) |
commit | 7b2f683fe2733153307cc6b870bcb37c87331cc9 (patch) | |
tree | 73bc8469727c3c0523c5f0920c4047e8a788e2f9 /include | |
parent | 4952236dd774bbfd6dcbc03de9ddf550a141d3ad (diff) | |
parent | 4d4a6a3f8a12602ce8dc800123715fe7b5c1c3a1 (diff) | |
download | linux-7b2f683fe2733153307cc6b870bcb37c87331cc9.tar.xz |
Merge tag 'v4.9.58' into linux-linaro-lsk-v4.9
This is the 4.9.58 stable release
Diffstat (limited to 'include')
-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 5062fb5..ed57211 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -4,6 +4,7 @@ #include <linux/kernel.h> #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 0f9265c..7af20a1 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; |