aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-05-14 23:49:31 +0000
committerLuka Perkov <luka@openwrt.org>2013-05-14 23:49:31 +0000
commit5349a138da5073b199f68a3570e40fc6580b21d6 (patch)
treeefa9eee4f3c700304b8b52013c0d81ad5de18a92 /package/network
parente252bdb15282edbbc4b3159cab8df5a2268f56bd (diff)
downloadupstream-5349a138da5073b199f68a3570e40fc6580b21d6.tar.gz
upstream-5349a138da5073b199f68a3570e40fc6580b21d6.tar.bz2
upstream-5349a138da5073b199f68a3570e40fc6580b21d6.zip
[package] iproute2: print help in connmark
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36637 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
-rw-r--r--package/network/utils/iproute2/Makefile2
-rw-r--r--package/network/utils/iproute2/patches/200-act_connmark.patch5
2 files changed, 5 insertions, 2 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 578010f76f..a875ffc76b 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
PKG_VERSION:=3.7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
diff --git a/package/network/utils/iproute2/patches/200-act_connmark.patch b/package/network/utils/iproute2/patches/200-act_connmark.patch
index 4a48ac3f01..ac6ba33792 100644
--- a/package/network/utils/iproute2/patches/200-act_connmark.patch
+++ b/package/network/utils/iproute2/patches/200-act_connmark.patch
@@ -10,7 +10,7 @@
TCMODULES += p_icmp.o
--- /dev/null
+++ b/tc/m_connmark.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,74 @@
+/*
+ * m_connmark.c Connection tracking marking import
+ *
@@ -62,6 +62,9 @@
+
+ NEXT_ARG();
+
++ if (matches(*argv, "help") == 0)
++ usage();
++
+ *argc_p = argc;
+ *argv_p = argv;
+ return 0;