diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-10-07 16:03:12 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-10-07 16:03:12 +0000 |
| commit | a3284cb0e1726c8f74bd80e5f1879d4cb0b97ed4 (patch) | |
| tree | 4ac3f975665a7f0a6ef467746a92ddf078601b17 /package | |
| parent | ce5e1abbb778411d9f6836d2b93ad4a57ba983e1 (diff) | |
| download | upstream-a3284cb0e1726c8f74bd80e5f1879d4cb0b97ed4.tar.gz upstream-a3284cb0e1726c8f74bd80e5f1879d4cb0b97ed4.tar.bz2 upstream-a3284cb0e1726c8f74bd80e5f1879d4cb0b97ed4.zip | |
iproute2: update to 2.6.39
Signed-off-by: Daniel Mierswa <impulze@impulze.org>
SVN-Revision: 28378
Diffstat (limited to 'package')
| -rw-r--r-- | package/iproute2/Makefile | 8 | ||||
| -rw-r--r-- | package/iproute2/patches/000-debian_patches_3.patch | 2 | ||||
| -rw-r--r-- | package/iproute2/patches/003-iproute2-get_dont_filter_cached.patch | 10 | ||||
| -rw-r--r-- | package/iproute2/patches/007-version_includes.patch | 3 | ||||
| -rw-r--r-- | package/iproute2/patches/200-act_connmark.patch | 2 |
5 files changed, 8 insertions, 17 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 7ffdfc02b0..38e493a6af 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=2.6.35 -PKG_RELEASE:=3 +PKG_VERSION:=2.6.39 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/ -PKG_MD5SUM:=b0f281b3124bf04669e18f5fe16d4934 +PKG_MD5SUM:=8a3b6bc77c2ecf752284aa4a6fc630a6 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) diff --git a/package/iproute2/patches/000-debian_patches_3.patch b/package/iproute2/patches/000-debian_patches_3.patch index 8e688f89cc..bdb1328e5f 100644 --- a/package/iproute2/patches/000-debian_patches_3.patch +++ b/package/iproute2/patches/000-debian_patches_3.patch @@ -654,9 +654,9 @@ TCMODULES += q_multiq.o TCMODULES += q_netem.o +TCMODULES += q_wrr.o + TCMODULES += q_choke.o TCMODULES += f_rsvp.o TCMODULES += f_u32.o - TCMODULES += f_route.o --- a/tc/q_htb.c +++ b/tc/q_htb.c @@ -1,3 +1,311 @@ diff --git a/package/iproute2/patches/003-iproute2-get_dont_filter_cached.patch b/package/iproute2/patches/003-iproute2-get_dont_filter_cached.patch deleted file mode 100644 index 35c1ac4c31..0000000000 --- a/package/iproute2/patches/003-iproute2-get_dont_filter_cached.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/ip/iproute.c -+++ b/ip/iproute.c -@@ -1286,6 +1286,7 @@ int iproute_get(int argc, char **argv) - memset(&req, 0, sizeof(req)); - - iproute_reset_filter(); -+ filter.cloned = 2; - - req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)); - req.n.nlmsg_flags = NLM_F_REQUEST; diff --git a/package/iproute2/patches/007-version_includes.patch b/package/iproute2/patches/007-version_includes.patch index 39bf49a0eb..30fefa34db 100644 --- a/package/iproute2/patches/007-version_includes.patch +++ b/package/iproute2/patches/007-version_includes.patch @@ -4,12 +4,13 @@ --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h -@@ -113,7 +113,10 @@ struct ipt_entry { +@@ -113,8 +113,11 @@ struct ipt_entry { #define IPT_CONTINUE XT_CONTINUE #define IPT_RETURN XT_RETURN +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + /* This group is older than old (iptables < v1.4.0-rc1~89) */ #include <linux/netfilter/xt_tcpudp.h> +#endif #define ipt_udp xt_udp diff --git a/package/iproute2/patches/200-act_connmark.patch b/package/iproute2/patches/200-act_connmark.patch index 561041f0af..bbc3041802 100644 --- a/package/iproute2/patches/200-act_connmark.patch +++ b/package/iproute2/patches/200-act_connmark.patch @@ -5,9 +5,9 @@ TCMODULES += m_pedit.o TCMODULES += m_skbedit.o +TCMODULES += m_connmark.o + TCMODULES += m_csum.o TCMODULES += p_ip.o TCMODULES += p_icmp.o - TCMODULES += p_tcp.o --- /dev/null +++ b/tc/m_connmark.c @@ -0,0 +1,71 @@ |