mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> 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
|
|
@@ -89,6 +89,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
|
|
@@ -232,6 +232,8 @@ enum {
|
|
__RTN_MAX
|
|
};
|
|
|
|
+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
|
|
+
|
|
#define RTN_MAX (__RTN_MAX - 1)
|
|
|
|
|