diff options
| author | Russell Senior <russell@personaltelco.net> | 2017-11-27 23:15:50 -0800 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2017-12-06 22:30:00 +0100 |
| commit | c3c1185d56abbae471c3d0bb0477349f79f5d3bb (patch) | |
| tree | 49c5a8a3402c636b613736ab8b027c11e8f8a165 /package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch | |
| parent | 711a816770b0447ab37fa709251605d7402e4fec (diff) | |
| download | upstream-c3c1185d56abbae471c3d0bb0477349f79f5d3bb.tar.gz upstream-c3c1185d56abbae471c3d0bb0477349f79f5d3bb.tar.bz2 upstream-c3c1185d56abbae471c3d0bb0477349f79f5d3bb.zip | |
iproute2: update to v4.14.1
Preserves optionality of libmnl by letting configuration
script follow the HAVE_MNL environment variable.
Signed-off-by: Russell Senior <russell@personaltelco.net>
Diffstat (limited to 'package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch')
| -rw-r--r-- | package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch b/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch index c022d17126..abd1f7eaca 100644 --- a/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch +++ b/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch @@ -14,9 +14,9 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> include/uapi/linux/libc-compat.h | 11 +++++++++++ 2 files changed, 14 insertions(+) ---- a/include/linux/if_ether.h -+++ b/include/linux/if_ether.h -@@ -22,6 +22,7 @@ +--- a/include/uapi/linux/if_ether.h ++++ b/include/uapi/linux/if_ether.h +@@ -23,6 +23,7 @@ #define _LINUX_IF_ETHER_H #include <linux/types.h> @@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -142,11 +143,13 @@ +@@ -149,11 +150,13 @@ * This is an Ethernet frame header. */ @@ -38,9 +38,9 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif /* _LINUX_IF_ETHER_H */ ---- a/include/linux/libc-compat.h -+++ b/include/linux/libc-compat.h -@@ -89,6 +89,14 @@ +--- a/include/uapi/linux/libc-compat.h ++++ b/include/uapi/linux/libc-compat.h +@@ -90,6 +90,14 @@ #endif /* _NET_IF_H */ @@ -55,7 +55,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* Coordinate with libc netinet/in.h header. */ #if defined(_NETINET_IN_H) -@@ -184,6 +192,9 @@ +@@ -185,6 +193,9 @@ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 |