X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/26966f2c7fcce9af92c12cddbe77ec7e3c29a762..3e2b2b02c5f09ba16b817b93681e6ea9f1333f3d:/package/iproute2/patches/000-debian_patches_3.patch diff --git a/package/iproute2/patches/000-debian_patches_3.patch b/package/iproute2/patches/000-debian_patches_3.patch index 9765e97bd..3c2debc1a 100644 --- a/package/iproute2/patches/000-debian_patches_3.patch +++ b/package/iproute2/patches/000-debian_patches_3.patch @@ -1,10 +1,20 @@ -Index: iproute2-2.6.25/doc/ip-cref.tex -=================================================================== ---- iproute2-2.6.25.orig/doc/ip-cref.tex 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/doc/ip-cref.tex 2008-05-01 00:26:48.000000000 +0100 -@@ -1315,6 +1315,19 @@ peers are allowed to send to us. - If it is not given, Linux uses the value selected with \verb|sysctl| - variable \verb|net/ipv4/tcp_reordering|. +--- + Makefile | 4 + doc/Makefile | 8 + doc/ip-cref.tex | 16 + + include/linux/pkt_sched.h | 518 ++++++++++++++++++++++++++++++++++++++++++++++ + ip/iptunnel.c | 2 + misc/Makefile | 3 + tc/Makefile | 1 + tc/q_htb.c | 308 +++++++++++++++++++++++++++ + tc/q_wrr.c | 322 ++++++++++++++++++++++++++++ + 9 files changed, 1177 insertions(+), 5 deletions(-) + +--- iproute2-2.6.35.orig/doc/ip-cref.tex ++++ iproute2-2.6.35/doc/ip-cref.tex +@@ -1307,6 +1307,19 @@ peers are allowed to send to us. + --- \threeonly the clamp for congestion window. It is ignored if the \verb|lock| + flag is not used. +\item \verb|hoplimit NUMBER| + @@ -20,22 +30,20 @@ Index: iproute2-2.6.25/doc/ip-cref.tex + window size. If it is not given (or set to zero), Linux uses the + values specified in~\cite{RFC2414}. + \item \verb|advmss NUMBER| - \item \verb|nexthop NEXTHOP| -@@ -2644,6 +2657,9 @@ http://www.cisco.com/univercd/cc/td/doc/ - \bibitem{RFC-DHCP} R.~Droms. - ``Dynamic Host Configuration Protocol.'', RFC-2131 +@@ -2664,6 +2677,9 @@ http://www.cisco.com/univercd/cc/td/doc/ + \bibitem{RFC2414} M.~Allman, S.~Floyd, C.~Partridge. + ``Increasing TCP's Initial Window'', RFC-2414. ++ +\bibitem{RFC2414} M.~Allman, S.~Floyd, C.~Partridge. +``Increasing TCP's Initial Window'', RFC-2414. -+ - \end{thebibliography} + \end{thebibliography} -Index: iproute2-2.6.25/doc/Makefile -=================================================================== ---- iproute2-2.6.25.orig/doc/Makefile 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/doc/Makefile 2008-05-01 00:26:48.000000000 +0100 +--- iproute2-2.6.35.orig/doc/Makefile ++++ iproute2-2.6.35/doc/Makefile @@ -14,6 +14,7 @@ PAGESIZE=a4 PAGESPERPAGE=2 @@ -67,10 +75,8 @@ Index: iproute2-2.6.25/doc/Makefile clean: - rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html + rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES) -Index: iproute2-2.6.25/include/linux/pkt_sched.h -=================================================================== ---- iproute2-2.6.25.orig/include/linux/pkt_sched.h 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/include/linux/pkt_sched.h 2008-05-01 00:37:45.000000000 +0100 +--- iproute2-2.6.35.orig/include/linux/pkt_sched.h ++++ iproute2-2.6.35/include/linux/pkt_sched.h @@ -1,3 +1,409 @@ +#if 0 +#ifndef __LINUX_PKT_SCHED_H @@ -481,9 +487,9 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h #ifndef __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H -@@ -482,4 +888,116 @@ struct tc_netem_corrupt - - #define NETEM_DIST_SCALE 8192 +@@ -481,4 +887,116 @@ struct tc_drr_stats { + __u32 deficit; + }; +/* WRR section */ + @@ -598,55 +604,9 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h +}; + #endif -Index: iproute2-2.6.25/ip/iproute.c -=================================================================== ---- iproute2-2.6.25.orig/ip/iproute.c 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/ip/iproute.c 2008-05-01 00:28:02.000000000 +0100 -@@ -73,7 +73,7 @@ static void usage(void) - fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ]\n"); - fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"); - fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ] [ src ADDRESS ]\n"); -- fprintf(stderr, " [ rto_min TIME ]\n"); -+ fprintf(stderr, " [ rto_min TIME ] [ hoplimit NUMBER ]\n"); - fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n"); - fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n"); - fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n"); -@@ -780,6 +780,30 @@ int iproute_modify(int cmd, unsigned fla - invarg("\"reordering\" value is invalid\n", *argv); - rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord); - #endif -+#ifdef RTAX_HOPLIMIT -+ } else if (strcmp(*argv, "hoplimit") == 0) { -+ unsigned hoplim; -+ NEXT_ARG(); -+ if (strcmp(*argv, "lock") == 0) { -+ mxlock |= (1<o_flags |= GRE_KEY; if (strchr(*argv, '.')) @@ -655,11 +615,9 @@ Index: iproute2-2.6.25/ip/iptunnel.c else { if (get_unsigned(&uval, *argv, 0)<0) { fprintf(stderr, "invalid value of \"okey\"\n"); -Index: iproute2-2.6.25/Makefile -=================================================================== ---- iproute2-2.6.25.orig/Makefile 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/Makefile 2008-05-01 00:26:48.000000000 +0100 -@@ -48,7 +48,7 @@ install: all +--- iproute2-2.6.35.orig/Makefile ++++ iproute2-2.6.35/Makefile +@@ -57,7 +57,7 @@ install: all $(DESTDIR)$(DOCDIR)/examples install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \ $(DESTDIR)$(DOCDIR)/examples/diffserv @@ -668,7 +626,7 @@ Index: iproute2-2.6.25/Makefile install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR) install -m 0755 -d $(DESTDIR)$(MANDIR)/man8 install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8 -@@ -65,7 +65,7 @@ snapshot: +@@ -75,7 +75,7 @@ snapshot: clean: rm -f cscope.* @@ -677,10 +635,8 @@ Index: iproute2-2.6.25/Makefile do $(MAKE) $(MFLAGS) -C $$i clean; done clobber: clean -Index: iproute2-2.6.25/misc/Makefile -=================================================================== ---- iproute2-2.6.25.orig/misc/Makefile 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/misc/Makefile 2008-05-01 00:26:48.000000000 +0100 +--- iproute2-2.6.35.orig/misc/Makefile ++++ iproute2-2.6.35/misc/Makefile @@ -1,7 +1,8 @@ SSOBJ=ss.o ssfilter.o LNSTATOBJ=lnstat.o lnstat_util.o @@ -691,22 +647,18 @@ Index: iproute2-2.6.25/misc/Makefile include ../Config -Index: iproute2-2.6.25/tc/Makefile -=================================================================== ---- iproute2-2.6.25.orig/tc/Makefile 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/tc/Makefile 2008-05-01 00:30:13.000000000 +0100 -@@ -13,6 +13,7 @@ TCMODULES += q_tbf.o - TCMODULES += q_cbq.o +--- iproute2-2.6.35.orig/tc/Makefile ++++ iproute2-2.6.35/tc/Makefile +@@ -15,6 +15,7 @@ TCMODULES += q_cbq.o TCMODULES += q_rr.o + TCMODULES += q_multiq.o TCMODULES += q_netem.o +TCMODULES += q_wrr.o TCMODULES += f_rsvp.o TCMODULES += f_u32.o TCMODULES += f_route.o -Index: iproute2-2.6.25/tc/q_htb.c -=================================================================== ---- iproute2-2.6.25.orig/tc/q_htb.c 2008-05-01 00:17:55.000000000 +0100 -+++ iproute2-2.6.25/tc/q_htb.c 2008-05-01 00:37:50.000000000 +0100 +--- iproute2-2.6.35.orig/tc/q_htb.c ++++ iproute2-2.6.35/tc/q_htb.c @@ -1,3 +1,311 @@ +#if 0 +/* @@ -1019,10 +971,8 @@ Index: iproute2-2.6.25/tc/q_htb.c /* * q_htb.c HTB. * -Index: iproute2-2.6.25/tc/q_wrr.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ iproute2-2.6.25/tc/q_wrr.c 2008-05-01 00:37:17.000000000 +0100 +--- /dev/null ++++ iproute2-2.6.35/tc/q_wrr.c @@ -0,0 +1,322 @@ +#include +#include