domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iproute2: bump to 4.13

Browse Source 
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker
2017-10-01 21:46:27 +02:00
parent 5bd006aa26
commit db18cee2d7
11 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/network/utils/iproute2/patches/001-config.patch
View File

@@ -1,8 +1,7 @@
--- /dev/null
+++ b/Config
@@ -0,0 +1,5 @@
@@ -0,0 +1,4 @@
+# Fixed config to disable ATM support even if present on host system
+IP_CONFIG_SETNS:=y
+TC_CONFIG_ATM:=n
+TC_CONFIG_XT:=y
+HAVE_MNL:=y

2
package/network/utils/iproute2/patches/004-darwin_fixes.patch
View File

@@ -42,7 +42,7 @@
#define TABLESIZE 16384
--- a/netem/paretonormal.c
+++ b/netem/paretonormal.c
@@ -15,10 +15,13 @@
@@ -14,10 +14,13 @@
#include <string.h>
#include <math.h>
#include <limits.h>

4
package/network/utils/iproute2/patches/006-no_sctp.patch
View File

@@ -1,6 +1,6 @@
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -465,7 +465,6 @@ void xfrm_selector_print(struct xfrm_sel
@@ -454,7 +454,6 @@ void xfrm_selector_print(struct xfrm_sel
switch (sel->proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:
@@ -8,7 +8,7 @@
case IPPROTO_DCCP:
default: /* XXX */
if (sel->sport_mask)
@@ -1321,7 +1320,6 @@ static int xfrm_selector_upspec_parse(st
@@ -1329,7 +1328,6 @@ static int xfrm_selector_upspec_parse(st
switch (sel->proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:

6
package/network/utils/iproute2/patches/008-no_netem.patch
View File

@@ -1,11 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
@@ -49,7 +49,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
YACCFLAGS = -d -t -v
-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man
+SUBDIRS=lib ip tc bridge misc genl tipc devlink man
-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
+SUBDIRS=lib ip tc bridge misc genl tipc devlink rdma man
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK)

2
package/network/utils/iproute2/patches/110-extra-ccopts.patch
View File

@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ HOSTCC ?= $(CC)
@@ -42,7 +42,7 @@ HOSTCC ?= $(CC)
DEFINES += -D_GNU_SOURCE
# Turn on transparent support for LFS
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE

4
package/network/utils/iproute2/patches/120-libnetlink-pic.patch
View File

@@ -1,7 +1,7 @@
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,7 +4,7 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
@@ -12,7 +12,7 @@ ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
endif
-CFLAGS += -fPIC

12
package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
View File

@@ -65,15 +65,3 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/* Definitions for in.h */
#define __UAPI_DEF_IN_ADDR 1
#define __UAPI_DEF_IN_IPPROTO 1
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -14,8 +14,8 @@
#include <string.h>
#include <netinet/in.h>
#include <linux/if_link.h>
-#include <linux/if_bridge.h>
#include <netinet/ether.h>
+#include <linux/if_bridge.h>
#include <net/if.h>
#include "rt_names.h"

16
package/network/utils/iproute2/patches/300-ip_tiny.patch
View File

@@ -1,7 +1,7 @@
--- a/ip/Makefile
+++ b/ip/Makefile
@@ -19,6 +19,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
@@ -28,6 +28,13 @@ ifeq ($(HAVE_MNL),y)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
+STATIC_SYM_FILTER:=
@@ -14,7 +14,7 @@
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
@@ -48,7 +55,7 @@ else
@@ -57,7 +64,7 @@ else
ip: static-syms.o
static-syms.o: static-syms.h
@@ -68,11 +68,11 @@
{ "netconf", do_ipnetconf },
+#endif
{ "vrf", do_ipvrf},
{ "sr", do_seg6 },
{ "help", do_help },
{ 0 }
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -777,6 +777,7 @@ const char *rt_addr_n2a_r(int af, int le
@@ -787,6 +787,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);
@@ -80,7 +80,7 @@
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
@@ -786,6 +787,7 @@ const char *rt_addr_n2a_r(int af, int le
@@ -796,6 +797,7 @@ const char *rt_addr_n2a_r(int af, int le
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
@@ -90,8 +90,8 @@
default:
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
@@ -12,6 +12,10 @@ ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
endif
+ifeq ($(IP_CONFIG_TINY),y)

2
package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
View File

@@ -24,7 +24,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -215,6 +215,7 @@ enum {
@@ -220,6 +220,7 @@ enum {
RTN_THROW, /* Not in this table */
RTN_NAT, /* Translate this address */
RTN_XRESOLVE, /* Use external resolver */

4
package/network/utils/iproute2/patches/950-add-cake-to-tc.patch
View File

@@ -1,6 +1,6 @@
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -863,4 +863,60 @@ struct tc_pie_xstats {
@@ -871,4 +871,60 @@ struct tc_pie_xstats {
__u32 maxq; /* maximum queue size */
__u32 ecn_mark; /* packets marked with ecn*/
};
@@ -63,7 +63,7 @@
#endif
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -67,6 +67,7 @@ TCMODULES += q_codel.o
@@ -69,6 +69,7 @@ TCMODULES += q_codel.o
TCMODULES += q_fq_codel.o
TCMODULES += q_fq.o
TCMODULES += q_pie.o