diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 20:56:45 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-03 20:56:45 +0000 |
commit | 8e9eed344245571c7684216aebc38384b6c4be2d (patch) | |
tree | f907a7ed53ded5f9f89d8ea9d57b625b94e3c4fc /package/network/utils/iproute2/patches/300-ip_tiny.patch | |
parent | f49dadb0bd6bfcf2e2d8cd12956821e063c91be6 (diff) | |
download | upstream-8e9eed344245571c7684216aebc38384b6c4be2d.tar.gz upstream-8e9eed344245571c7684216aebc38384b6c4be2d.tar.bz2 upstream-8e9eed344245571c7684216aebc38384b6c4be2d.zip |
iproute2: update to 4.3.0
iproute2-4.0 had connmark support added by nbd. This does not work
with 4.x kernels. iproute2-4.3 is the latest version and has his
changes mainlined. This patch updates the package to iproute2-4.3
and fixes the patches so that it compiles. This should resolve
ticket #21374.
Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
SVN-Revision: 48098
Diffstat (limited to 'package/network/utils/iproute2/patches/300-ip_tiny.patch')
-rw-r--r-- | package/network/utils/iproute2/patches/300-ip_tiny.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 14518dce1c..c0ebfd3ce5 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-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 -@@ -71,30 +71,42 @@ static const struct cmd { +@@ -73,30 +73,42 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { "address", do_ipaddr }, @@ -44,7 +44,7 @@ { "link", do_iplink }, +#ifndef IPROUTE2_TINY { "l2tp", do_ipl2tp }, - { "fou", do_ipfou }, + { "fou", do_ipfou }, +#endif { "tunnel", do_iptunnel }, { "tunl", do_iptunnel }, @@ -53,7 +53,7 @@ { "tap", do_iptuntap }, { "token", do_iptoken }, { "tcpmetrics", do_tcp_metrics }, - { "tcp_metrics",do_tcp_metrics }, + { "tcp_metrics", do_tcp_metrics }, +#endif { "monitor", do_ipmonitor }, +#ifndef IPROUTE2_TINY @@ -70,22 +70,22 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -642,6 +642,7 @@ const char *rt_addr_n2a(int af, const vo - case AF_INET: - case AF_INET6: +@@ -675,6 +675,7 @@ const char *rt_addr_n2a(int af, int len, return inet_ntop(af, addr, buf, buflen); + case AF_MPLS: + return mpls_ntop(af, addr, buf, buflen); +#ifndef IPROUTE2_TINY case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -650,6 +651,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -683,6 +684,7 @@ const char *rt_addr_n2a(int af, int len, memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, &dna, buf, buflen); } +#endif + case AF_PACKET: + return ll_addr_n2a(addr, len, ARPHRD_VOID, buf, buflen); default: - return "???"; - } --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y) |