iproute2: update to v4.0.0

[oweals/openwrt.git] / package / network / utils / iproute2 / patches / 900-drop_FAILED_POLICY.patch

diff --git a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
index d6c5ccd7b24bc669bedf8e7d8456b6b4a923297f..f5d2dfe9b9bd34906f3210d6ddcb69c7085c3c9b 100644 (file)
--- a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
+++ b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
@@ -9,8 +9,6 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
  ip/rtm_map.c              |    4 ++++
  3 files changed, 9 insertions(+)
 
-diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
-index 51da65b..3420838 100644
 --- a/include/linux/fib_rules.h
 +++ b/include/linux/fib_rules.h
 @@ -64,6 +64,10 @@ enum {
@@ -24,11 +22,9 @@ index 51da65b..3420838 100644
        __FR_ACT_MAX,
  };
  
-diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
-index 93370bd..cfec9ff 100644
 --- a/include/linux/rtnetlink.h
 +++ b/include/linux/rtnetlink.h
-@@ -203,6 +203,7 @@ enum {
+@@ -208,6 +208,7 @@ enum {
        RTN_THROW,              /* Not in this table            */
        RTN_NAT,                /* Translate this address       */
        RTN_XRESOLVE,           /* Use external resolver        */
@@ -36,11 +32,9 @@ index 93370bd..cfec9ff 100644
        __RTN_MAX
  };
  
-diff --git a/ip/rtm_map.c b/ip/rtm_map.c
-index 21e818b..8ad2d07 100644
 --- a/ip/rtm_map.c
 +++ b/ip/rtm_map.c
-@@ -49,6 +49,8 @@ char *rtnl_rtntype_n2a(int id, char *buf, int len)
+@@ -49,6 +49,8 @@ char *rtnl_rtntype_n2a(int id, char *buf
                return "nat";
        case RTN_XRESOLVE:
                return "xresolve";
@@ -58,6 +52,3 @@ index 21e818b..8ad2d07 100644
        else {
                res = strtoul(arg, &end, 0);
                if (!end || end == arg || *end || res > 255)
--- 
-1.7.10.4
-