mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
b3f95490b9
This adds initial support for kernel 4.14 based on the patches for kernel 4.9. In the configuration I deactivated some of the new possible security features like: CONFIG_REFCOUNT_FULL CONFIG_SLAB_FREELIST_HARDENED CONFIG_SOFTLOCKUP_DETECTOR CONFIG_WARN_ALL_UNSEEDED_RANDOM And these overlay FS options are also deactivated: CONFIG_OVERLAY_FS_INDEX CONFIG_OVERLAY_FS_REDIRECT_DIR I activated this: CONFIG_FORTIFY_SOURCE CONFIG_POSIX_TIMERS CONFIG_SLAB_MERGE_DEFAULT CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED I am not sure if I did the porting correct for the following patches: target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch target/linux/generic/hack-4.14/220-gc_sections.patch target/linux/generic/hack-4.14/321-powerpc_crtsavres_prereq.patch target/linux/generic/pending-4.14/305-mips_module_reloc.patch target/linux/generic/pending-4.14/611-netfilter_match_bypass_default_table.patch target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From: David Heidelberger <david.heidelberger@ixit.cz>
|
|
Subject: uapi/if_ether.h: prevent redefinition of struct ethhdr
|
|
|
|
Musl provides its own ethhdr struct definition. Add a guard to prevent
|
|
its definition of the appropriate musl header has already been included.
|
|
|
|
Signed-off-by: John Spencer <maillist-linux@barfooze.de>
|
|
Tested-by: David Heidelberger <david.heidelberger@ixit.cz>
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
---
|
|
include/uapi/linux/if_ether.h | 3 +++
|
|
include/uapi/linux/libc-compat.h | 11 +++++++++++
|
|
2 files changed, 14 insertions(+)
|
|
|
|
--- a/include/uapi/linux/if_ether.h
|
|
+++ b/include/uapi/linux/if_ether.h
|
|
@@ -23,6 +23,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
|
|
@@ -149,11 +150,13 @@
|
|
* 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 */
|
|
--- a/include/uapi/linux/libc-compat.h
|
|
+++ b/include/uapi/linux/libc-compat.h
|
|
@@ -90,6 +90,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. */
|
|
+#if defined(_NETINET_IF_ETHER_H)
|
|
+#define __UAPI_DEF_ETHHDR 0
|
|
+#else
|
|
+#define __UAPI_DEF_ETHHDR 1
|
|
+#endif
|
|
+
|
|
/* Coordinate with libc netinet/in.h header. */
|
|
#if defined(_NETINET_IN_H)
|
|
|
|
@@ -185,6 +193,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
|
|
+
|
|
/* Definitions for in.h */
|
|
#define __UAPI_DEF_IN_ADDR 1
|
|
#define __UAPI_DEF_IN_IPPROTO 1
|