diff options
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch index 8dc1edc33b..fb7e1de17a 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | |||
@@ -11,37 +11,11 @@ Upstream-Status: Submitted | |||
11 | include/uapi/linux/libc-compat.h | 6 ++++++ | 11 | include/uapi/linux/libc-compat.h | 6 ++++++ |
12 | 2 files changed, 9 insertions(+), 1 deletion(-) | 12 | 2 files changed, 9 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | Index: linux-4.8-rc4/include/uapi/linux/if_ether.h | 14 | Index: linux-4.15/include/uapi/linux/libc-compat.h |
15 | =================================================================== | 15 | =================================================================== |
16 | --- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h | 16 | --- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 |
17 | +++ linux-4.8-rc4/include/uapi/linux/if_ether.h | 17 | +++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 |
18 | @@ -22,6 +22,7 @@ | 18 | @@ -51,6 +51,12 @@ |
19 | #define _UAPI_LINUX_IF_ETHER_H | ||
20 | |||
21 | #include <linux/types.h> | ||
22 | +#include <linux/libc-compat.h> | ||
23 | |||
24 | /* | ||
25 | * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble | ||
26 | @@ -138,11 +139,12 @@ | ||
27 | * This is an Ethernet frame header. | ||
28 | */ | ||
29 | |||
30 | +#if __UAPI_DEF_ETHHDR | ||
31 | struct ethhdr { | ||
32 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ | ||
33 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ | ||
34 | __be16 h_proto; /* packet type ID field */ | ||
35 | } __attribute__((packed)); | ||
36 | - | ||
37 | +#endif | ||
38 | |||
39 | #endif /* _UAPI_LINUX_IF_ETHER_H */ | ||
40 | Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h | ||
41 | =================================================================== | ||
42 | --- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h | ||
43 | +++ linux-4.8-rc4/include/uapi/linux/libc-compat.h | ||
44 | @@ -50,6 +50,12 @@ | ||
45 | 19 | ||
46 | #ifndef __KERNEL__ /* we're used from userspace */ | 20 | #ifndef __KERNEL__ /* we're used from userspace */ |
47 | 21 | ||
@@ -52,5 +26,5 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h | |||
52 | +#endif | 26 | +#endif |
53 | + | 27 | + |
54 | /* Coordinate with libc net/if.h header. */ | 28 | /* Coordinate with libc net/if.h header. */ |
55 | #if defined(_NET_IF_H) && defined(__USE_MISC) | 29 | #if defined(_NET_IF_H) |
56 | 30 | ||