History

BackMerge tag 'v4.15-rc8' into drm-next

Linux 4.15-rc8 Daniel requested this for so the intel CI won't fall over on drm-next so often.

Dave Airlie committed 8 years ago

Commit 4a6cc7a2 parents 8563188 a8750dd820 files · +11798 −3892Browse files

Showing the changes to include/uapi/linux (3 of 820 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/if_ether.h +3 −0
  2. include/uapi/linux/libc-compat.h +60 −1
  3. include/uapi/linux/netfilter/nf_conntrack_common.h +1 −1
include/uapi/linux/if_ether.h+3−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #define _UAPI_LINUX_IF_ETHER_H
2424
2525 #include <linux/types.h>
26+#include <linux/libc-compat.h>
2627
2728 /*
2829 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -149,11 +150,13 @@ · 120 unmodified lines
149150 * This is an Ethernet frame header.
150151 */
151152
153+#if __UAPI_DEF_ETHHDR
152154 struct ethhdr {
153155 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
154156 unsigned char h_source[ETH_ALEN]; /* source ether addr */
155157 __be16 h_proto; /* packet type ID field */
156158 } __attribute__((packed));
159+#endif
157160
158161
159162 #endif /* _UAPI_LINUX_IF_ETHER_H */
include/uapi/linux/libc-compat.h+60−1
@@ -168,47 +168,106 @@ · 167 unmodified lines
168168
169169 /* If we did not see any headers from any supported C libraries,
170170 * or we are being included in the kernel, then define everything
171− * that we need. */
171+ * that we need. Check for previous __UAPI_* definitions to give
172+ * unsupported C libraries a way to opt out of any kernel definition. */
172173 #else /* !defined(__GLIBC__) */
173174
174175 /* Definitions for if.h */
176+#ifndef __UAPI_DEF_IF_IFCONF
175177 #define __UAPI_DEF_IF_IFCONF 1
178+#endif
179+#ifndef __UAPI_DEF_IF_IFMAP
176180 #define __UAPI_DEF_IF_IFMAP 1
181+#endif
182+#ifndef __UAPI_DEF_IF_IFNAMSIZ
177183 #define __UAPI_DEF_IF_IFNAMSIZ 1
184+#endif
185+#ifndef __UAPI_DEF_IF_IFREQ
178186 #define __UAPI_DEF_IF_IFREQ 1
187+#endif
179188 /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
189+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
180190 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
191+#endif
181192 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
193+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
182194 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
195+#endif
183196
184197 /* Definitions for in.h */
198+#ifndef __UAPI_DEF_IN_ADDR
185199 #define __UAPI_DEF_IN_ADDR 1
200+#endif
201+#ifndef __UAPI_DEF_IN_IPPROTO
186202 #define __UAPI_DEF_IN_IPPROTO 1
203+#endif
204+#ifndef __UAPI_DEF_IN_PKTINFO
187205 #define __UAPI_DEF_IN_PKTINFO 1
206+#endif
207+#ifndef __UAPI_DEF_IP_MREQ
188208 #define __UAPI_DEF_IP_MREQ 1
209+#endif
210+#ifndef __UAPI_DEF_SOCKADDR_IN
189211 #define __UAPI_DEF_SOCKADDR_IN 1
212+#endif
213+#ifndef __UAPI_DEF_IN_CLASS
190214 #define __UAPI_DEF_IN_CLASS 1
215+#endif
191216
192217 /* Definitions for in6.h */
218+#ifndef __UAPI_DEF_IN6_ADDR
193219 #define __UAPI_DEF_IN6_ADDR 1
220+#endif
221+#ifndef __UAPI_DEF_IN6_ADDR_ALT
194222 #define __UAPI_DEF_IN6_ADDR_ALT 1
223+#endif
224+#ifndef __UAPI_DEF_SOCKADDR_IN6
195225 #define __UAPI_DEF_SOCKADDR_IN6 1
226+#endif
227+#ifndef __UAPI_DEF_IPV6_MREQ
196228 #define __UAPI_DEF_IPV6_MREQ 1
229+#endif
230+#ifndef __UAPI_DEF_IPPROTO_V6
197231 #define __UAPI_DEF_IPPROTO_V6 1
232+#endif
233+#ifndef __UAPI_DEF_IPV6_OPTIONS
198234 #define __UAPI_DEF_IPV6_OPTIONS 1
235+#endif
236+#ifndef __UAPI_DEF_IN6_PKTINFO
199237 #define __UAPI_DEF_IN6_PKTINFO 1
238+#endif
239+#ifndef __UAPI_DEF_IP6_MTUINFO
200240 #define __UAPI_DEF_IP6_MTUINFO 1
241+#endif
201242
202243 /* Definitions for ipx.h */
244+#ifndef __UAPI_DEF_SOCKADDR_IPX
203245 #define __UAPI_DEF_SOCKADDR_IPX 1
246+#endif
247+#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION
204248 #define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
249+#endif
250+#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION
205251 #define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
252+#endif
253+#ifndef __UAPI_DEF_IPX_CONFIG_DATA
206254 #define __UAPI_DEF_IPX_CONFIG_DATA 1
255+#endif
256+#ifndef __UAPI_DEF_IPX_ROUTE_DEF
207257 #define __UAPI_DEF_IPX_ROUTE_DEF 1
258+#endif
208259
209260 /* Definitions for xattr.h */
261+#ifndef __UAPI_DEF_XATTR
210262 #define __UAPI_DEF_XATTR 1
263+#endif
211264
212265 #endif /* __GLIBC__ */
213266
267+/* Definitions for if_ether.h */
268+/* allow libcs like musl to deactivate this, glibc does not implement this. */
269+#ifndef __UAPI_DEF_ETHHDR
270+#define __UAPI_DEF_ETHHDR 1
271+#endif
272+
214273 #endif /* _UAPI_LIBC_COMPAT_H */
include/uapi/linux/netfilter/nf_conntrack_common.h+1−1
@@ -36,7 +36,7 @@ enum ip_conntrack_info { · 35 unmodified lines
3636
3737 #define NF_CT_STATE_INVALID_BIT (1 << 0)
3838 #define NF_CT_STATE_BIT(ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1))
39−#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_UNTRACKED + 1))
39+#define NF_CT_STATE_UNTRACKED_BIT (1 << 6)
4040
4141 /* Bitset representing status of connection. */
4242 enum ip_conntrack_status {