target/linux/generic/patches-4.1/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch

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