diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-07 14:30:54 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-07 16:39:41 +0000 |
| commit | 1c16eb63cb8063c494256774dd9ab47d68c84735 (patch) | |
| tree | 5ddd6037a746fc8214580ae9ca938ea3b7e82a0e /main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | |
| parent | c1f625220214a7386dbbdb6f5ec1803e1b96873b (diff) | |
| download | aports-1c16eb63cb8063c494256774dd9ab47d68c84735.tar.bz2 aports-1c16eb63cb8063c494256774dd9ab47d68c84735.tar.xz | |
main/linux-headers: upgrade to 4.4.6
Diffstat (limited to 'main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch')
| -rw-r--r-- | main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index b8ac94fb07..0000000000 --- a/main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./include/uapi/linux/if_ether.h.orig -+++ ./include/uapi/linux/if_ether.h -@@ -22,6 +22,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include <linux/types.h> -+#include <linux/libc-compat.h> - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -130,11 +131,12 @@ - * This is an Ethernet frame header. - */ - -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -- -+#endif - - #endif /* _UAPI_LINUX_IF_ETHER_H */ ---- ./include/uapi/linux/libc-compat.h.orig -+++ ./include/uapi/linux/libc-compat.h -@@ -50,6 +50,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc netinet/in.h header. */ - #ifdef _NETINET_IN_H - |