iproute2: bumped to 4.18.0

Author: negan07

diffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-003-fix_compile_error_lib.diff

@@ -1,14 +1,14 @@
-diff -urN work/iproute2-4.16.0/Makefile work/iproute2-4.16.0/Makefile
---- work/iproute2-4.16.0/Makefile	2017-02-20 17:47:52.000000000 +0100
-+++ work/iproute2-4.16.0/Makefile	2017-04-01 12:47:22.848442441 +0200
+diff -urN work/iproute2-4.18.0/Makefile work/iproute2-4.18.0/Makefile
+--- work/iproute2-4.18.0/Makefile	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/Makefile	2018-10-06 23:26:15.681053749 +0200
 @@ -1,5 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0
  # Top level Makefile for iproute2
 +include ../Rules.mak
 
  ifeq ("$(origin V)", "command line")
  VERBOSE = $(V)
-@@ -21,7 +22,7 @@
+@@ -23,7 +24,7 @@
  DOCDIR?=$(DATADIR)/doc/iproute2
  MANDIR?=$(DATADIR)/man
  ARPDDIR?=/var/lib/arpd
@@ -17,7 +17,7 @@ diff -urN work/iproute2-4.16.0/Makefile work/iproute2-4.16.0/Makefile
  BASH_COMPDIR?=$(DATADIR)/bash-completion/completions
 
  # Path to db_185.h include
-@@ -45,19 +46,19 @@
+@@ -49,19 +50,19 @@
  #options for mpls
  ADDLIB+=mpls_ntop.o mpls_pton.o
 
@@ -39,9 +39,9 @@ diff -urN work/iproute2-4.16.0/Makefile work/iproute2-4.16.0/Makefile
 -SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
 +SUBDIRS=lib ip tc
 
- LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+ LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
  LDLIBS += $(LIBNETLINK)
-@@ -65,27 +66,21 @@
+@@ -69,27 +70,21 @@
  all: config.mk
  	@set -e; \
  	for i in $(SUBDIRS); \
@@ -80,7 +80,7 @@ diff -urN work/iproute2-4.16.0/Makefile work/iproute2-4.16.0/Makefile
 
  snapshot:
  	echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
-@@ -105,4 +100,17 @@
+@@ -109,4 +104,17 @@
  cscope:
  	cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
 

diffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-900-drop_failed_policy.diff

@@ -1,7 +1,7 @@
-diff -urN work/iproute2-4.16.0/include/uapi/linux/fib_rules.h work/iproute2-4.16.0/include/uapi/linux/fib_rules.h
---- work/iproute2-4.16.0/include/uapi/linux/fib_rules.h	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/include/uapi/linux/fib_rules.h	2018-04-20 21:08:59.358439672 +0200
-@@ -54,6 +54,9 @@
+diff -urN work/iproute2-4.18.0/include/uapi/linux/fib_rules.h work/iproute2-4.18.0/include/uapi/linux/fib_rules.h
+--- work/iproute2-4.18.0/include/uapi/linux/fib_rules.h	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/include/uapi/linux/fib_rules.h	2018-04-20 21:08:59.358439672 +0200
+@@ -59,6 +59,9 @@
  	FRA_SUPPRESS_PREFIXLEN,
  	FRA_TABLE,	/* Extended table id */
  	FRA_FWMASK,	/* mask for netfilter mark */
@@ -11,9 +11,9 @@ diff -urN work/iproute2-4.16.0/include/uapi/linux/fib_rules.h work/iproute2-4.16
  	FRA_OIFNAME,
  	FRA_PAD,
  	FRA_L3MDEV,	/* iif or oif is l3mdev goto its table */
-diff -urN work/iproute2-4.16.0/include/uapi/linux/netfilter_ipv4/ip_tables.h work/iproute2-4.16.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
---- work/iproute2-4.16.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-04-20 21:17:03.765089515 +0200
+diff -urN work/iproute2-4.18.0/include/uapi/linux/netfilter_ipv4/ip_tables.h work/iproute2-4.18.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
+--- work/iproute2-4.18.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-04-20 21:17:03.765089515 +0200
 @@ -15,47 +15,130 @@
 
  #ifndef _IPTABLES_H
@@ -360,10 +360,18 @@ diff -urN work/iproute2-4.16.0/include/uapi/linux/netfilter_ipv4/ip_tables.h wor
 +#define IPT_ALIGN(s) (((s) + (__alignof__(struct ipt_entry)-1)) & ~(__alignof__(struct ipt_entry)-1))
 +#endif /*__KERNEL__*/
  #endif /* _IPTABLES_H */
-diff -urN work/iproute2-4.16.0/include/uapi/linux/rtnetlink.h work/iproute2-4.16.0/include/uapi/linux/rtnetlink.h
---- work/iproute2-4.16.0/include/uapi/linux/rtnetlink.h	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/include/uapi/linux/rtnetlink.h	2018-04-20 21:17:26.501019155 +0200
-@@ -317,6 +317,9 @@
+diff -urN work/iproute2-4.18.0/include/uapi/linux/rtnetlink.h work/iproute2-4.18.0/include/uapi/linux/rtnetlink.h
+--- work/iproute2-4.18.0/include/uapi/linux/rtnetlink.h	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/include/uapi/linux/rtnetlink.h	2018-10-06 23:57:22.539399817 +0200
+@@ -221,6 +221,7 @@
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_FAILED_POLICY,      /* Source address failed policy */
+ 	__RTN_MAX
+ };
+ 
+@@ -322,6 +323,9 @@
  	RTA_MP_ALGO, /* no longer used */
  	RTA_TABLE,
  	RTA_MARK,
@@ -373,9 +381,9 @@ diff -urN work/iproute2-4.16.0/include/uapi/linux/rtnetlink.h work/iproute2-4.16
  	RTA_MFC_STATS,
  	RTA_VIA,
  	RTA_NEWDST,
-diff -urN work/iproute2-4.16.0/ip/ip6tunnel.c work/iproute2-4.16.0/ip/ip6tunnel.c
---- work/iproute2-4.16.0/ip/ip6tunnel.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/ip/ip6tunnel.c	2018-04-20 21:18:07.068892928 +0200
+diff -urN work/iproute2-4.18.0/ip/ip6tunnel.c work/iproute2-4.18.0/ip/ip6tunnel.c
+--- work/iproute2-4.18.0/ip/ip6tunnel.c	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/ip/ip6tunnel.c	2018-10-06 23:31:20.836129558 +0200
 @@ -42,6 +42,9 @@
 
  #define DEFAULT_TNL_HOP_LIMIT	(64)
@@ -386,10 +394,10 @@ diff -urN work/iproute2-4.16.0/ip/ip6tunnel.c work/iproute2-4.16.0/ip/ip6tunnel.
  static void usage(void) __attribute__((noreturn));
 
  static void usage(void)
-diff -urN work/iproute2-4.16.0/ip/iprule.c work/iproute2-4.16.0/ip/iprule.c
---- work/iproute2-4.16.0/ip/iprule.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/ip/iprule.c	2018-04-20 21:19:58.532542503 +0200
-@@ -44,6 +44,9 @@
+diff -urN work/iproute2-4.18.0/ip/iprule.c work/iproute2-4.18.0/ip/iprule.c
+--- work/iproute2-4.18.0/ip/iprule.c	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/ip/iprule.c	2018-10-06 23:36:15.851236079 +0200
+@@ -45,6 +45,9 @@
  		"       ip rule { flush | save | restore }\n"
  		"       ip rule [ list [ SELECTOR ]]\n"
  		"SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n"
@@ -398,10 +406,10 @@ diff -urN work/iproute2-4.16.0/ip/iprule.c work/iproute2-4.16.0/ip/iprule.c
 +#endif
  		"            [ iif STRING ] [ oif STRING ] [ pref NUMBER ] [ l3mdev ]\n"
  		"            [ uidrange NUMBER-NUMBER ]\n"
- 		"ACTION := [ table TABLE_ID ]\n"
-@@ -249,6 +252,16 @@
- 		else
- 			fprintf(fp, "fwmark 0x%x ", mark);
+ 		"            [ ipproto PROTOCOL ]\n"
+@@ -269,6 +272,16 @@
+ 			print_0xhex(PRINT_ANY, "fwmark", "fwmark 0x%x ", mark);
+ 		}
  	}
 +#ifdef _SC_BUILD_
 +	if (tb[RTA_SCMARK]) {
@@ -415,8 +423,8 @@ diff -urN work/iproute2-4.16.0/ip/iprule.c work/iproute2-4.16.0/ip/iprule.c
 +#endif
 
  	if (tb[FRA_IFNAME]) {
- 		fprintf(fp, "iif %s ", rta_getattr_str(tb[FRA_IFNAME]));
-@@ -654,7 +667,22 @@
+ 		if (!is_json_context())
+@@ -758,7 +771,22 @@
  				addattr32(&req.n, sizeof(req),
  					  FRA_FWMASK, fwmask);
  			}
@@ -440,10 +448,10 @@ diff -urN work/iproute2-4.16.0/ip/iprule.c work/iproute2-4.16.0/ip/iprule.c
  			__u32 realm;
 
  			NEXT_ARG();
-diff -urN work/iproute2-4.16.0/tc/f_fw.c work/iproute2-4.16.0/tc/f_fw.c
---- work/iproute2-4.16.0/tc/f_fw.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/tc/f_fw.c	2018-04-20 21:21:16.020296574 +0200
-@@ -109,6 +109,11 @@
+diff -urN work/iproute2-4.18.0/tc/f_fw.c work/iproute2-4.18.0/tc/f_fw.c
+--- work/iproute2-4.18.0/tc/f_fw.c	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/tc/f_fw.c	2018-10-06 23:38:43.522788844 +0200
+@@ -108,6 +108,11 @@
  			}
  			strncpy(d, *argv, sizeof(d) - 1);
  			addattr_l(n, MAX_MSG, TCA_FW_INDEV, d, strlen(d) + 1);
@@ -455,10 +463,10 @@ diff -urN work/iproute2-4.16.0/tc/f_fw.c work/iproute2-4.16.0/tc/f_fw.c
  		} else if (strcmp(*argv, "help") == 0) {
  			explain();
  			return -1;
-diff -urN work/iproute2-4.16.0/tc/Makefile work/iproute2-4.16.0/tc/Makefile
---- work/iproute2-4.16.0/tc/Makefile	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/tc/Makefile	2018-04-20 21:20:48.212385006 +0200
-@@ -111,7 +111,7 @@
+diff -urN work/iproute2-4.18.0/tc/Makefile work/iproute2-4.18.0/tc/Makefile
+--- work/iproute2-4.18.0/tc/Makefile	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/tc/Makefile	2018-10-06 23:59:22.967035093 +0200
+@@ -112,7 +112,7 @@
  TCLIB += tc_estimator.o
  TCLIB += tc_stab.o
 
@@ -467,19 +475,18 @@ diff -urN work/iproute2-4.16.0/tc/Makefile work/iproute2-4.16.0/tc/Makefile
  ifneq ($(IPT_LIB_DIR),)
  	CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
  endif
-diff -urN work/iproute2-4.16.0/tc/tc_util.c work/iproute2-4.16.0/tc/tc_util.c
---- work/iproute2-4.16.0/tc/tc_util.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/tc/tc_util.c	2018-04-20 21:21:55.276171451 +0200
-@@ -71,7 +71,7 @@
- 
+diff -urN work/iproute2-4.18.0/tc/tc_util.c work/iproute2-4.18.0/tc/tc_util.c
+--- work/iproute2-4.18.0/tc/tc_util.c	2018-08-13 21:11:32.000000000 +0200
++++ work/iproute2-4.18.0/tc/tc_util.c	2018-10-06 23:41:07.470352887 +0200
+@@ -72,6 +72,7 @@
  	return lib_dir;
  }
--
+ 
 +#define rint(x) x
  int get_qdisc_handle(__u32 *h, const char *str)
  {
  	__u32 maj;
-@@ -257,7 +257,9 @@
+@@ -257,7 +258,9 @@
  int get_rate(unsigned int *rate, const char *str)
  {
  	char *p;

diffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-911-fix_in_h_include.diff

@@ -0,0 +1,11 @@
+diff -urN work/iproute2-4.18.0/lib/bpf.c work/iproute2-4.18.0/lib/bpf.c
+--- work/iproute2-4.18.0/lib/bpf.c	2016-12-13 00:07:42.000000000 +0100
++++ work/iproute2-4.18.0/lib/bpf.c	2017-02-15 23:42:50.657173101 +0100
+@@ -38,6 +38,7 @@
+ #include <sys/resource.h>
+ 
+ #include <arpa/inet.h>
++#include <linux/fs.h>
+ 
+ #include "utils.h"
+ #include "json_print.h"

…8_work_iproute2-4.16.0-000-makefile.diff …8_work_iproute2-4.18.0-000-makefile.diffdiffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-000-makefile.diff renamed to diffs/work/iproute2-4.18.0/D7000_V1.0.1.68_work_iproute2-4.18.0-000-makefile.diff diffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-000-makefile.diff renamed to diffs/work/iproute2-4.18.0/D7000_V1.0.1.68_work_iproute2-4.18.0-000-makefile.diff

@@ -1,6 +1,6 @@
-diff -urN work/iproute2-4.16.0/ip/ipxfrm.c work/iproute2-4.16.0/ip/ipxfrm.c
---- work/iproute2-4.16.0/ip/ipxfrm.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/ip/ipxfrm.c	2018-04-20 21:38:38.597470630 +0200
+diff -urN work/iproute2-4.18.0/ip/ipxfrm.c work/iproute2-4.18.0/ip/ipxfrm.c
+--- work/iproute2-4.18.0/ip/ipxfrm.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/ip/ipxfrm.c	2018-04-20 21:38:38.597470630 +0200
 @@ -454,7 +454,6 @@
  	switch (sel->proto) {
  	case IPPROTO_TCP:
@@ -17,9 +17,9 @@ diff -urN work/iproute2-4.16.0/ip/ipxfrm.c work/iproute2-4.16.0/ip/ipxfrm.c
  		case IPPROTO_DCCP:
  		case IPPROTO_IP: /* to allow shared SA for different protocols */
  			break;
-diff -urN work/iproute2-4.16.0/ip/xfrm_policy.c work/iproute2-4.16.0/ip/xfrm_policy.c
---- work/iproute2-4.16.0/ip/xfrm_policy.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/ip/xfrm_policy.c	2018-04-20 21:40:50.429080215 +0200
+diff -urN work/iproute2-4.18.0/ip/xfrm_policy.c work/iproute2-4.18.0/ip/xfrm_policy.c
+--- work/iproute2-4.18.0/ip/xfrm_policy.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/ip/xfrm_policy.c	2018-04-20 21:40:50.429080215 +0200
 @@ -68,7 +68,6 @@
  	fprintf(stderr, "UPSPEC := proto { { ");
  	fprintf(stderr, "%s | ", strxf_proto(IPPROTO_TCP));
@@ -28,9 +28,9 @@ diff -urN work/iproute2-4.16.0/ip/xfrm_policy.c work/iproute2-4.16.0/ip/xfrm_pol
  	fprintf(stderr, "%s", strxf_proto(IPPROTO_DCCP));
  	fprintf(stderr, " } [ sport PORT ] [ dport PORT ] |\n");
  	fprintf(stderr, "                  { ");
-diff -urN work/iproute2-4.16.0/ip/xfrm_state.c work/iproute2-4.16.0/ip/xfrm_state.c
---- work/iproute2-4.16.0/ip/xfrm_state.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/ip/xfrm_state.c	2018-04-20 21:40:48.273086640 +0200
+diff -urN work/iproute2-4.18.0/ip/xfrm_state.c work/iproute2-4.18.0/ip/xfrm_state.c
+--- work/iproute2-4.18.0/ip/xfrm_state.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/ip/xfrm_state.c	2018-04-20 21:40:48.273086640 +0200
 @@ -95,7 +95,6 @@
  	fprintf(stderr, "UPSPEC := proto { { ");
  	fprintf(stderr, "%s | ", strxf_proto(IPPROTO_TCP));
@@ -39,9 +39,9 @@ diff -urN work/iproute2-4.16.0/ip/xfrm_state.c work/iproute2-4.16.0/ip/xfrm_stat
  	fprintf(stderr, "%s", strxf_proto(IPPROTO_DCCP));
  	fprintf(stderr, " } [ sport PORT ] [ dport PORT ] |\n");
  	fprintf(stderr, "                  { ");
-diff -urN work/iproute2-4.16.0/tc/f_flower.c work/iproute2-4.16.0/tc/f_flower.c
---- work/iproute2-4.16.0/tc/f_flower.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/tc/f_flower.c	2018-04-20 21:41:47.220910562 +0200
+diff -urN work/iproute2-4.18.0/tc/f_flower.c work/iproute2-4.18.0/tc/f_flower.c
+--- work/iproute2-4.18.0/tc/f_flower.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/tc/f_flower.c	2018-04-20 21:41:47.220910562 +0200
 @@ -52,7 +52,7 @@
  		"                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n"
  		"                       dst_mac MASKED-LLADDR |\n"
@@ -51,7 +51,7 @@ diff -urN work/iproute2-4.16.0/tc/f_flower.c work/iproute2-4.16.0/tc/f_flower.c
  		"                       ip_tos MASKED-IP_TOS |\n"
  		"                       ip_ttl MASKED-IP_TTL |\n"
  		"                       mpls_label LABEL |\n"
-@@ -213,8 +213,6 @@
+@@ -214,8 +214,6 @@
  		ip_proto = IPPROTO_TCP;
  	} else if (matches(str, "udp") == 0) {
  		ip_proto = IPPROTO_UDP;
@@ -60,7 +60,7 @@ diff -urN work/iproute2-4.16.0/tc/f_flower.c work/iproute2-4.16.0/tc/f_flower.c
  	} else if (matches(str, "icmp") == 0) {
  		if (eth_type != htons(ETH_P_IP))
  			goto err;
-@@ -452,10 +450,6 @@
+@@ -453,10 +451,6 @@
  		return endpoint == FLOWER_ENDPOINT_SRC ?
  			TCA_FLOWER_KEY_UDP_SRC :
  			TCA_FLOWER_KEY_UDP_DST;
@@ -71,7 +71,7 @@ diff -urN work/iproute2-4.16.0/tc/f_flower.c work/iproute2-4.16.0/tc/f_flower.c
  	else
  		return -1;
  }
-@@ -1104,8 +1098,6 @@
+@@ -1107,8 +1101,6 @@
  		sprintf(out, "tcp");
  	else if (ip_proto == IPPROTO_UDP)
  		sprintf(out, "udp");

…te2-4.16.0-001-sercomm_netgear_orig.diff …te2-4.18.0-001-sercomm_netgear_orig.diffdiffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-001-sercomm_netgear_orig.diff renamed to diffs/work/iproute2-4.18.0/D7000_V1.0.1.68_work_iproute2-4.18.0-001-sercomm_netgear_orig.diff diffs/work/iproute2-4.16.0/D7000_V1.0.1.68_work_iproute2-4.16.0-001-sercomm_netgear_orig.diff renamed to diffs/work/iproute2-4.18.0/D7000_V1.0.1.68_work_iproute2-4.18.0-001-sercomm_netgear_orig.diff

@@ -1,6 +1,6 @@
-diff -urN work/iproute2-4.16.0/configure work/iproute2-4.16.0/configure
---- work/iproute2-4.16.0/configure	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/configure	2018-04-20 22:46:49.538797017 +0200
+diff -urN work/iproute2-4.18.0/configure work/iproute2-4.18.0/configure
+--- work/iproute2-4.18.0/configure	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/configure	2018-04-20 22:46:49.538797017 +0200
 @@ -281,7 +281,7 @@
 
  check_mnl()

diffs/work/iproute2-4.18.0/D7000_V1.0.1.68_work_iproute2-4.18.0-003-fix_compile_error_lib.diff

@@ -1,6 +1,6 @@
-diff -urN work/iproute2-4.16.0/include/netinet/tcp.h work/iproute2-4.16.0/include/netinet/tcp.h
---- work/iproute2-4.16.0/include/netinet/tcp.h	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/include/netinet/tcp.h	1970-01-01 01:00:00.000000000 +0100
+diff -urN work/iproute2-4.18.0/include/netinet/tcp.h work/iproute2-4.18.0/include/netinet/tcp.h
+--- work/iproute2-4.18.0/include/netinet/tcp.h	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/include/netinet/tcp.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,231 +0,0 @@
 -/*
 - * Copyright (c) 1982, 1986, 1993
@@ -233,9 +233,9 @@ diff -urN work/iproute2-4.16.0/include/netinet/tcp.h work/iproute2-4.16.0/includ
 -#endif /* Misc.  */
 -
 -#endif /* netinet/tcp.h */
-diff -urN work/iproute2-4.16.0/lib/dnet_ntop.c work/iproute2-4.16.0/lib/dnet_ntop.c
---- work/iproute2-4.16.0/lib/dnet_ntop.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/lib/dnet_ntop.c	2018-04-20 21:49:10.427566080 +0200
+diff -urN work/iproute2-4.18.0/lib/dnet_ntop.c work/iproute2-4.18.0/lib/dnet_ntop.c
+--- work/iproute2-4.18.0/lib/dnet_ntop.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/lib/dnet_ntop.c	2018-04-20 21:49:10.427566080 +0200
 @@ -1,25 +1,26 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  #include <errno.h>
@@ -278,9 +278,9 @@ diff -urN work/iproute2-4.16.0/lib/dnet_ntop.c work/iproute2-4.16.0/lib/dnet_nto
  	size_t pos = 0;
  	int started = 0;
 
-diff -urN work/iproute2-4.16.0/lib/dnet_pton.c work/iproute2-4.16.0/lib/dnet_pton.c
---- work/iproute2-4.16.0/lib/dnet_pton.c	2018-04-02 19:06:08.000000000 +0200
-+++ work/iproute2-4.16.0/lib/dnet_pton.c	2018-04-20 21:50:28.875325503 +0200
+diff -urN work/iproute2-4.18.0/lib/dnet_pton.c work/iproute2-4.18.0/lib/dnet_pton.c
+--- work/iproute2-4.18.0/lib/dnet_pton.c	2018-04-02 19:06:08.000000000 +0200
++++ work/iproute2-4.18.0/lib/dnet_pton.c	2018-04-20 21:50:28.875325503 +0200
 @@ -1,24 +1,25 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  #include <errno.h>