iproute2: update to v4.14.1

[openwrt/openwrt.git] / package / network / utils / iproute2 / patches / 271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch

diff --git a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch b/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
index b0ed5991960089d43be97af5c24f9e0be2eae74e..e3364ad0592e6e6e0c7a150df6820e35b4cf0b10 100644 (file)
--- a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
+++ b/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
@@ -15,9 +15,9 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  include/uapi/linux/libc-compat.h | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
---- a/include/linux/libc-compat.h
-+++ b/include/linux/libc-compat.h
-@@ -48,13 +48,13 @@
+--- a/include/uapi/linux/libc-compat.h
++++ b/include/uapi/linux/libc-compat.h
+@@ -49,13 +49,13 @@
  #ifndef _LIBC_COMPAT_H
  #define _LIBC_COMPAT_H
  
@@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * that would already be defined. */
  
  #define __UAPI_DEF_IF_IFCONF 0
-@@ -65,7 +65,11 @@
+@@ -66,7 +66,11 @@
  #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
  /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
  #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
@@ -48,7 +48,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
  
  #else /* _NET_IF_H */
-@@ -85,10 +89,10 @@
+@@ -86,10 +90,10 @@
  
  #endif /* _NET_IF_H */
  
@@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * that would already be defined. */
  #define __UAPI_DEF_IN_ADDR            0
  #define __UAPI_DEF_IN_IPPROTO         0
-@@ -102,7 +106,7 @@
+@@ -103,7 +107,7 @@
   * if the glibc code didn't define them. This guard matches
   * the guard in glibc/inet/netinet/in.h which defines the
   * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
@@ -70,7 +70,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #define __UAPI_DEF_IN6_ADDR_ALT               0
  #else
  #define __UAPI_DEF_IN6_ADDR_ALT               1
-@@ -117,7 +121,7 @@
+@@ -118,7 +122,7 @@
  #else
  
  /* Linux headers included first, and we must define everything
@@ -79,7 +79,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * __UAPI_DEF_* defines and adjust appropriately. */
  #define __UAPI_DEF_IN_ADDR            1
  #define __UAPI_DEF_IN_IPPROTO         1
-@@ -127,7 +131,7 @@
+@@ -128,7 +132,7 @@
  #define __UAPI_DEF_IN_CLASS           1
  
  #define __UAPI_DEF_IN6_ADDR           1
@@ -88,7 +88,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * coordinate. */
  #define __UAPI_DEF_IN6_ADDR_ALT               1
  #define __UAPI_DEF_SOCKADDR_IN6               1
-@@ -168,7 +172,7 @@
+@@ -169,7 +173,7 @@
  /* If we did not see any headers from any supported C libraries,
   * or we are being included in the kernel, then define everything
   * that we need. */
@@ -97,7 +97,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  /* Definitions for if.h */
  #define __UAPI_DEF_IF_IFCONF 1
-@@ -208,6 +212,6 @@
+@@ -209,6 +213,6 @@
  /* Definitions for xattr.h */
  #define __UAPI_DEF_XATTR              1