diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-31 11:49:56 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-03-31 11:49:56 -0700 |
| commit | 67b3b9dd002823a751ff46eb08b03d9288bda9f1 (patch) | |
| tree | 4781995a7518a1509b136a3aee6b125e022d622a /original/uapi/linux | |
| parent | e2841822257360cb230f905142503ce6a684005b (diff) | |
| download | kernel-headers-67b3b9dd002823a751ff46eb08b03d9288bda9f1.tar.gz | |
Upgrade kernel headers to 3.18.10.
Change-Id: I23a3a4062f3f71ef1df4a3c82b0a50b66b964426
Diffstat (limited to 'original/uapi/linux')
| -rw-r--r-- | original/uapi/linux/can/netlink.h | 1 | ||||
| -rw-r--r-- | original/uapi/linux/in6.h | 3 | ||||
| -rw-r--r-- | original/uapi/linux/libc-compat.h | 3 | ||||
| -rw-r--r-- | original/uapi/linux/target_core_user.h | 4 | ||||
| -rw-r--r-- | original/uapi/linux/version.h | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/original/uapi/linux/can/netlink.h b/original/uapi/linux/can/netlink.h index 3e4323a..94ffe0c 100644 --- a/original/uapi/linux/can/netlink.h +++ b/original/uapi/linux/can/netlink.h @@ -98,6 +98,7 @@ struct can_ctrlmode { #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ #define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ +#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ /* * CAN device statistics diff --git a/original/uapi/linux/in6.h b/original/uapi/linux/in6.h index 74a2a17..79b12b0 100644 --- a/original/uapi/linux/in6.h +++ b/original/uapi/linux/in6.h @@ -149,7 +149,7 @@ struct in6_flowlabel_req { /* * IPV6 socket options */ - +#if __UAPI_DEF_IPV6_OPTIONS #define IPV6_ADDRFORM 1 #define IPV6_2292PKTINFO 2 #define IPV6_2292HOPOPTS 3 @@ -196,6 +196,7 @@ struct in6_flowlabel_req { #define IPV6_IPSEC_POLICY 34 #define IPV6_XFRM_POLICY 35 +#endif /* * Multicast: diff --git a/original/uapi/linux/libc-compat.h b/original/uapi/linux/libc-compat.h index c140620..e28807a 100644 --- a/original/uapi/linux/libc-compat.h +++ b/original/uapi/linux/libc-compat.h @@ -69,6 +69,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 +#define __UAPI_DEF_IPV6_OPTIONS 0 #else @@ -82,6 +83,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPPROTO_V6 1 +#define __UAPI_DEF_IPV6_OPTIONS 1 #endif /* _NETINET_IN_H */ @@ -103,6 +105,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPPROTO_V6 1 +#define __UAPI_DEF_IPV6_OPTIONS 1 /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1 diff --git a/original/uapi/linux/target_core_user.h b/original/uapi/linux/target_core_user.h index 7dcfbe6..b483d19 100644 --- a/original/uapi/linux/target_core_user.h +++ b/original/uapi/linux/target_core_user.h @@ -6,10 +6,6 @@ #include <linux/types.h> #include <linux/uio.h> -#ifndef __packed -#define __packed __attribute__((packed)) -#endif - #define TCMU_VERSION "1.0" /* diff --git a/original/uapi/linux/version.h b/original/uapi/linux/version.h index d837816..b8e4ed0 100644 --- a/original/uapi/linux/version.h +++ b/original/uapi/linux/version.h @@ -1,2 +1,2 @@ -#define LINUX_VERSION_CODE 201219 +#define LINUX_VERSION_CODE 201226 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |