aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/iproute2/patches/008-no_netem.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-03 20:56:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-03 20:56:45 +0000
commit8e9eed344245571c7684216aebc38384b6c4be2d (patch)
treef907a7ed53ded5f9f89d8ea9d57b625b94e3c4fc /package/network/utils/iproute2/patches/008-no_netem.patch
parentf49dadb0bd6bfcf2e2d8cd12956821e063c91be6 (diff)
downloadupstream-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/008-no_netem.patch')
-rw-r--r--package/network/utils/iproute2/patches/008-no_netem.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch
index 165ce0c9b9..232a6ea973 100644
--- a/package/network/utils/iproute2/patches/008-no_netem.patch
+++ b/package/network/utils/iproute2/patches/008-no_netem.patch
@@ -1,11 +1,12 @@
--- a/Makefile
+++ b/Makefile
-@@ -36,7 +36,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
- CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+@@ -41,7 +41,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 man
-+SUBDIRS=lib ip tc bridge misc genl man
-
+
+-SUBDIRS=lib ip tc bridge misc netem genl tipc man
++SUBDIRS=lib ip tc bridge misc genl tipc man
+
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK)
+