74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
50 lines
1.2 KiB
Diff
50 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
|
|
@@ -73,6 +73,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
|
|
@@ -118,6 +118,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
|
|
@@ -219,6 +219,8 @@ enum {
|
|
__RTN_MAX
|
|
};
|
|
|
|
+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
|
|
+
|
|
#define RTN_MAX (__RTN_MAX - 1)
|
|
|
|
|