aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/iproute2/patches/170-ip_tiny.patch
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-11-05 15:32:48 +0100
committerHans Dedecker <dedeckeh@gmail.com>2018-11-08 11:09:13 +0100
commit559635dbb6983b4e95f167d0ac2d3a75af6d3102 (patch)
treeaa494457b47ca25753a186c2ea0cd5811bc2bd27 /package/network/utils/iproute2/patches/170-ip_tiny.patch
parent68b43270f9bd18d6c28b7d45d2453ae220d760ea (diff)
downloadupstream-559635dbb6983b4e95f167d0ac2d3a75af6d3102.tar.gz
upstream-559635dbb6983b4e95f167d0ac2d3a75af6d3102.tar.bz2
upstream-559635dbb6983b4e95f167d0ac2d3a75af6d3102.zip
iproute2: update to 4.19.0
Update to the latest version of iproute2; see https://lwn.net/Articles/769354/ for a full overview of the changes in 4.19. Remove 190-add-cake-to-tc patch as CAKE qdisc is now supported in 4.19.0 Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/utils/iproute2/patches/170-ip_tiny.patch')
-rw-r--r--package/network/utils/iproute2/patches/170-ip_tiny.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index 5c8af0b0f1..dc0547a256 100644
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -25,7 +25,7 @@
sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
--- a/ip/ip.c
+++ b/ip/ip.c
-@@ -48,10 +48,16 @@ static void usage(void)
+@@ -47,10 +47,16 @@ static void usage(void)
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
@@ -42,7 +42,7 @@
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
-@@ -73,32 +79,44 @@ static const struct cmd {
+@@ -72,32 +78,44 @@ static const struct cmd {
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },
@@ -89,7 +89,7 @@
{ "help", do_help },
--- a/lib/utils.c
+++ b/lib/utils.c
-@@ -1010,6 +1010,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -1012,6 +1012,7 @@ const char *rt_addr_n2a_r(int af, int le
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
@@ -97,7 +97,7 @@
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
-@@ -1019,6 +1020,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -1021,6 +1022,7 @@ const char *rt_addr_n2a_r(int af, int le
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}