From e8836a14fb66b5fb195cd3ba75dd4bec487576c3 Mon Sep 17 00:00:00 2001 From: Jonas Gorski <jogo@openwrt.org> Date: Mon, 30 Oct 2017 17:01:04 +0530 Subject: [PATCH] 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(+) diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h index 813fbe789..b54d4140c 100644 --- 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 diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h index 590beda78..435c5c1c6 100644 --- 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 */ diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 7d65056a6..83b6c3e22 100644 --- 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) -- GitLab