So I looked over the previous email on the 2.6.39 update for iproute and noticed this:
- TCMODULES += p_tcp.o ??? And I note: I have most of the patch set to 'cerowrt' stashed here: http://huchra.bufferbloat.net/~cero1/patches/ I was getting ready - after getting them through some lab testing - to submit them to the list. From reading over that previous patch that went by I think I needed to do something about choke, etc, that I didn't do, but I'm not quite ready to test that yet. So it would be good to get a few mark one eyeballs here. Of these, those not marked as 'Lame' would be good to get into openwrt head, and the most important of which were the iptables and iproute2 updates. in the openwrt subdir off of that url: 0001-Allow-inetd-mode-again- in-ssh.patch # needed for xinetd support - you could revert an old commit here 0001-update-openwrt-to-2.6.39.3.patch # works 0002-add-local-mac-support-for-wndr3700.patch # from jow, originally: needed to do routing rather than bridging 0003-add-ath9k-de-bufferbloat-patch.patch # VERY LAME: NOW NUKED AS PART OF BUG 216 0004-ESFQ-is-ill-maintained-obsolete-and-replaced-by-bett.patch # possibly lame, My opinion only 0005-Add-drr-and-choke-schedulers.patch # Lame patch for these 0006-Add-support-for-netem-network-emulator.patch # Lame also - think this is fixed in head now 0007-Add-reno-bic-cubic-veno-netdrop.patch # Lame patch for these, want YEAH-TCP too eventually 0008-update-iproute2-to-2.6.39.patch # God knows if this will break older kernels or not, but needed 0009-update-iptables-to-1.4.12.patch # Same, but both these were needed for cerowrt, SFB, ECN, etc 0010-correct-links-for-iptables-ip6tables-to-xtables.patch # Corrected goof on the new xtables linkage On Tue, Aug 9, 2011 at 11:48 AM, Daniel Mierswa <[email protected]> wrote: > > Signed-off-by: Daniel Mierswa <[email protected]> > --- > package/iproute2/Makefile | 8 ++++---- > .../iproute2/patches/000-debian_patches_3.patch | 2 +- > .../003-iproute2-get_dont_filter_cached.patch | 10 ---------- > .../iproute2/patches/007-version_includes.patch | 3 ++- > package/iproute2/patches/200-act_connmark.patch | 2 +- > 5 files changed, 8 insertions(+), 17 deletions(-) > delete mode 100644 > package/iproute2/patches/003-iproute2-get_dont_filter_cached.patch > > diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile > index 7ffdfc0..38e493a 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<http://devresources.linux-foundation.org/dev/iproute2/download/%0A-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 8e688f8..bdb1328 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 35c1ac4..0000000 > --- 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 39bf49a..30fefa3 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 561041f..bbc3041 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 @@ > -- > 1.7.6 > > _______________________________________________ > openwrt-devel mailing list > [email protected] > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > -- Dave Täht SKYPE: davetaht US Tel: 1-239-829-5608 http://the-edge.blogspot.com
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
