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

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