671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From: Jonas Gorski <jogo@openwrt.org>
  2. Subject: net: provide defines for _POLICY_FAILED until all code is updated
  3. Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
  4. unreachable, conflicting with our name.
  5. Add appropriate defines to allow our code to build with the new
  6. name until we have updated our local patches for older kernels
  7. and userspace packages.
  8. Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  9. ---
  10. include/uapi/linux/fib_rules.h | 2 ++
  11. include/uapi/linux/icmpv6.h | 2 ++
  12. include/uapi/linux/rtnetlink.h | 2 ++
  13. 3 files changed, 6 insertions(+)
  14. --- a/include/uapi/linux/fib_rules.h
  15. +++ b/include/uapi/linux/fib_rules.h
  16. @@ -80,6 +80,8 @@ enum {
  17. __FR_ACT_MAX,
  18. };
  19. +#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
  20. +
  21. #define FR_ACT_MAX (__FR_ACT_MAX - 1)
  22. #endif
  23. --- a/include/uapi/linux/icmpv6.h
  24. +++ b/include/uapi/linux/icmpv6.h
  25. @@ -119,6 +119,8 @@ struct icmp6hdr {
  26. #define ICMPV6_POLICY_FAIL 5
  27. #define ICMPV6_REJECT_ROUTE 6
  28. +#define ICMPV6_FAILED_POLICY ICMPV6_POLICY_FAIL
  29. +
  30. /*
  31. * Codes for Time Exceeded
  32. */
  33. --- a/include/uapi/linux/rtnetlink.h
  34. +++ b/include/uapi/linux/rtnetlink.h
  35. @@ -225,6 +225,8 @@ enum {
  36. __RTN_MAX
  37. };
  38. +#define RTN_FAILED_POLICY RTN_POLICY_FAILED
  39. +
  40. #define RTN_MAX (__RTN_MAX - 1)