mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +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>
51 lines
1.2 KiB
Diff
51 lines
1.2 KiB
Diff
From: Jonas Gorski <jogo@openwrt.org>
|
|
Subject: net: provide defines for _POLICY_FAILED until all code is updated
|
|
|
|
Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
|
|
unreachable, conflicting with our name.
|
|
|
|
Add appropriate defines to allow our code to build with the new
|
|
name until we have updated our local patches for older kernels
|
|
and userspace packages.
|
|
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
---
|
|
include/uapi/linux/fib_rules.h | 2 ++
|
|
include/uapi/linux/icmpv6.h | 2 ++
|
|
include/uapi/linux/rtnetlink.h | 2 ++
|
|
3 files changed, 6 insertions(+)
|
|
|
|
--- a/include/uapi/linux/fib_rules.h
|
|
+++ b/include/uapi/linux/fib_rules.h
|
|
@@ -80,6 +80,8 @@ enum {
|
|
__FR_ACT_MAX,
|
|
};
|
|
|
|
+#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
|
|
+
|
|
#define FR_ACT_MAX (__FR_ACT_MAX - 1)
|
|
|
|
#endif
|
|
--- a/include/uapi/linux/icmpv6.h
|
|
+++ b/include/uapi/linux/icmpv6.h
|
|
@@ -119,6 +119,8 @@ struct icmp6hdr {
|
|
#define ICMPV6_POLICY_FAIL 5
|
|
#define ICMPV6_REJECT_ROUTE 6
|
|
|
|
+#define ICMPV6_FAILED_POLICY ICMPV6_POLICY_FAIL
|
|
+
|
|
/*
|
|
* Codes for Time Exceeded
|
|
*/
|
|
--- a/include/uapi/linux/rtnetlink.h
|
|
+++ b/include/uapi/linux/rtnetlink.h
|
|
@@ -225,6 +225,8 @@ enum {
|
|
__RTN_MAX
|
|
};
|
|
|
|
+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
|
|
+
|
|
#define RTN_MAX (__RTN_MAX - 1)
|
|
|
|
|