diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-05-19 19:32:46 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-05-19 21:08:06 +0200 |
| commit | c4664b0f911614a2d19eddcb9b52e2937581ca5b (patch) | |
| tree | 30eb6e0e9d8be2f37d1d54e7489aa36251f65c6d /target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch | |
| parent | d354bfde174514973309e788e11c286f1667c2f5 (diff) | |
| download | upstream-c4664b0f911614a2d19eddcb9b52e2937581ca5b.tar.gz upstream-c4664b0f911614a2d19eddcb9b52e2937581ca5b.tar.bz2 upstream-c4664b0f911614a2d19eddcb9b52e2937581ca5b.zip | |
kernel: update kernel 4.4 to version 4.4.11
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch index ff7677f760..9065369040 100644 --- a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch +++ b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch @@ -40,9 +40,9 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif /* _UAPI_LINUX_IF_ETHER_H */ --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h -@@ -51,6 +51,14 @@ - /* We have included libc headers... */ - #if !defined(__KERNEL__) +@@ -85,6 +85,14 @@ + + #endif /* _NET_IF_H */ +/* musl defines the ethhdr struct itself in its netinet/if_ether.h. + * Glibc just includes the kernel header and uses a different guard. */ @@ -55,9 +55,9 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* Coordinate with libc netinet/in.h header. */ #if defined(_NETINET_IN_H) -@@ -117,6 +125,9 @@ - * that we need. */ - #else /* defined(__KERNEL__) */ +@@ -161,6 +169,9 @@ + /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 +/* Definitions for if_ether.h */ +#define __UAPI_DEF_ETHHDR 1 |