KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upgrade iproute2 to 2.6.29-1 - includes support for the skbedit scheduler action

Browse source 
SVN-Revision: 16777
This commit is contained in:
Felix Fietkau 2009-07-11 14:05:54 +00:00
parent 7dc435ea29
commit b5730c409f
9 changed files with 61 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/iproute2/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2 PKG_NAME:=iproute2
PKG_VERSION:=2.6.25 PKG_VERSION:=2.6.29-1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/ PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/
PKG_MD5SUM:=5737bade2f5e03fad0e2c81da91e551e PKG_MD5SUM:=c1bc258a6c345905e79935ac7a3cc582
PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)

80
package/iproute2/patches/000-debian_patches_3.patch
View file

@ -1,8 +1,6 @@
Index: iproute2-2.6.25/doc/ip-cref.tex --- a/doc/ip-cref.tex
=================================================================== +++ b/doc/ip-cref.tex
--- iproute2-2.6.25.orig/doc/ip-cref.tex 2008-05-01 00:17:55.000000000 +0100 @@ -1324,6 +1324,19 @@ peers are allowed to send to us.
+++ 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| If it is not given, Linux uses the value selected with \verb|sysctl|
variable \verb|net/ipv4/tcp_reordering|. variable \verb|net/ipv4/tcp_reordering|.
@ -22,7 +20,7 @@ Index: iproute2-2.6.25/doc/ip-cref.tex
\item \verb|nexthop NEXTHOP| \item \verb|nexthop NEXTHOP|
@@ -2644,6 +2657,9 @@ http://www.cisco.com/univercd/cc/td/doc/ @@ -2653,6 +2666,9 @@ http://www.cisco.com/univercd/cc/td/doc/
\bibitem{RFC-DHCP} R.~Droms. \bibitem{RFC-DHCP} R.~Droms.
``Dynamic Host Configuration Protocol.'', RFC-2131 ``Dynamic Host Configuration Protocol.'', RFC-2131
@ -32,10 +30,8 @@ Index: iproute2-2.6.25/doc/ip-cref.tex
\end{thebibliography} \end{thebibliography}
Index: iproute2-2.6.25/doc/Makefile --- a/doc/Makefile
=================================================================== +++ b/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
@@ -14,6 +14,7 @@ PAGESIZE=a4 @@ -14,6 +14,7 @@ PAGESIZE=a4
PAGESPERPAGE=2 PAGESPERPAGE=2
@ -67,10 +63,8 @@ Index: iproute2-2.6.25/doc/Makefile
clean: clean:
- rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html - rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html
+ rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES) + rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES)
Index: iproute2-2.6.25/include/linux/pkt_sched.h --- a/include/linux/pkt_sched.h
=================================================================== +++ b/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
@@ -1,3 +1,409 @@ @@ -1,3 +1,409 @@
+#if 0 +#if 0
+#ifndef __LINUX_PKT_SCHED_H +#ifndef __LINUX_PKT_SCHED_H
@ -481,9 +475,9 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h
#ifndef __LINUX_PKT_SCHED_H #ifndef __LINUX_PKT_SCHED_H
#define __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H
@@ -482,4 +888,116 @@ struct tc_netem_corrupt @@ -518,4 +924,116 @@ struct tc_drr_stats
__u32 deficit;
#define NETEM_DIST_SCALE 8192 };
+/* WRR section */ +/* WRR section */
+ +
@ -598,10 +592,8 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h
+}; +};
+ +
#endif #endif
Index: iproute2-2.6.25/ip/iproute.c --- a/ip/iproute.c
=================================================================== +++ b/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) @@ -73,7 +73,7 @@ static void usage(void)
fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ]\n"); fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ]\n");
fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"); fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n");
@ -611,7 +603,7 @@ Index: iproute2-2.6.25/ip/iproute.c
fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n"); fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n"); fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n");
fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n"); fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
@@ -780,6 +780,30 @@ int iproute_modify(int cmd, unsigned fla @@ -792,6 +792,30 @@ int iproute_modify(int cmd, unsigned fla
invarg("\"reordering\" value is invalid\n", *argv); invarg("\"reordering\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord);
#endif #endif
@ -642,10 +634,8 @@ Index: iproute2-2.6.25/ip/iproute.c
} else if (strcmp(*argv, "rtt") == 0) { } else if (strcmp(*argv, "rtt") == 0) {
unsigned rtt; unsigned rtt;
NEXT_ARG(); NEXT_ARG();
Index: iproute2-2.6.25/ip/iptunnel.c --- a/ip/iptunnel.c
=================================================================== +++ b/ip/iptunnel.c
--- iproute2-2.6.25.orig/ip/iptunnel.c 2008-05-01 00:17:55.000000000 +0100
+++ iproute2-2.6.25/ip/iptunnel.c 2008-05-01 00:26:48.000000000 +0100
@@ -134,7 +134,7 @@ static int parse_args(int argc, char **a @@ -134,7 +134,7 @@ static int parse_args(int argc, char **a
NEXT_ARG(); NEXT_ARG();
p->o_flags |= GRE_KEY; p->o_flags |= GRE_KEY;
@ -655,11 +645,9 @@ Index: iproute2-2.6.25/ip/iptunnel.c
else { else {
if (get_unsigned(&uval, *argv, 0)<0) { if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"okey\"\n"); fprintf(stderr, "invalid value of \"okey\"\n");
Index: iproute2-2.6.25/Makefile --- a/Makefile
=================================================================== +++ b/Makefile
--- iproute2-2.6.25.orig/Makefile 2008-05-01 00:17:55.000000000 +0100 @@ -49,7 +49,7 @@ install: all
+++ iproute2-2.6.25/Makefile 2008-05-01 00:26:48.000000000 +0100
@@ -48,7 +48,7 @@ install: all
$(DESTDIR)$(DOCDIR)/examples $(DESTDIR)$(DOCDIR)/examples
install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \ install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
$(DESTDIR)$(DOCDIR)/examples/diffserv $(DESTDIR)$(DOCDIR)/examples/diffserv
@ -668,7 +656,7 @@ Index: iproute2-2.6.25/Makefile
install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR) install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
install -m 0755 -d $(DESTDIR)$(MANDIR)/man8 install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8 install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
@@ -65,7 +65,7 @@ snapshot: @@ -67,7 +67,7 @@ snapshot:
clean: clean:
rm -f cscope.* rm -f cscope.*
@ -677,10 +665,8 @@ Index: iproute2-2.6.25/Makefile
do $(MAKE) $(MFLAGS) -C $$i clean; done do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clean clobber: clean
Index: iproute2-2.6.25/misc/Makefile --- a/misc/Makefile
=================================================================== +++ b/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
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
SSOBJ=ss.o ssfilter.o SSOBJ=ss.o ssfilter.o
LNSTATOBJ=lnstat.o lnstat_util.o LNSTATOBJ=lnstat.o lnstat_util.o
@ -691,22 +677,18 @@ Index: iproute2-2.6.25/misc/Makefile
include ../Config include ../Config
Index: iproute2-2.6.25/tc/Makefile --- a/tc/Makefile
=================================================================== +++ b/tc/Makefile
--- iproute2-2.6.25.orig/tc/Makefile 2008-05-01 00:17:55.000000000 +0100 @@ -14,6 +14,7 @@ TCMODULES += q_cbq.o
+++ 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
TCMODULES += q_rr.o TCMODULES += q_rr.o
TCMODULES += q_multiq.o
TCMODULES += q_netem.o TCMODULES += q_netem.o
+TCMODULES += q_wrr.o +TCMODULES += q_wrr.o
TCMODULES += f_rsvp.o TCMODULES += f_rsvp.o
TCMODULES += f_u32.o TCMODULES += f_u32.o
TCMODULES += f_route.o TCMODULES += f_route.o
Index: iproute2-2.6.25/tc/q_htb.c --- a/tc/q_htb.c
=================================================================== +++ b/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
@@ -1,3 +1,311 @@ @@ -1,3 +1,311 @@
+#if 0 +#if 0
+/* +/*
@ -1019,10 +1001,8 @@ Index: iproute2-2.6.25/tc/q_htb.c
/* /*
* q_htb.c HTB. * q_htb.c HTB.
* *
Index: iproute2-2.6.25/tc/q_wrr.c --- /dev/null
=================================================================== +++ b/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
@@ -0,0 +1,322 @@ @@ -0,0 +1,322 @@
+#include <stdio.h> +#include <stdio.h>
+#include <stdlib.h> +#include <stdlib.h>

6
package/iproute2/patches/001-iproute2-2.6.11_Config.patch
View file

@ -1,7 +1,5 @@
Index: iproute-2.6.20-070313/Config --- /dev/null
=================================================================== +++ b/Config
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ iproute-2.6.20-070313/Config 2007-06-09 13:53:58.000000000 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+# Fixed config to disable ATM support even if present on host system +# Fixed config to disable ATM support even if present on host system
+TC_CONFIG_ATM:=n +TC_CONFIG_ATM:=n

10
package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
View file

@ -1,8 +1,6 @@
Index: iproute2-2.6.25/ip/ipxfrm.c --- a/ip/ipxfrm.c
=================================================================== +++ b/ip/ipxfrm.c
--- iproute2-2.6.25.orig/ip/ipxfrm.c 2008-04-17 18:12:54.000000000 +0100 @@ -491,7 +491,6 @@ void xfrm_selector_print(struct xfrm_sel
+++ iproute2-2.6.25/ip/ipxfrm.c 2008-05-01 00:38:40.000000000 +0100
@@ -490,7 +490,6 @@ void xfrm_selector_print(struct xfrm_sel
switch (sel->proto) { switch (sel->proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: case IPPROTO_UDP:
@ -10,7 +8,7 @@ Index: iproute2-2.6.25/ip/ipxfrm.c
case IPPROTO_DCCP: case IPPROTO_DCCP:
default: /* XXX */ default: /* XXX */
if (sel->sport_mask) if (sel->sport_mask)
@@ -1121,7 +1120,6 @@ static int xfrm_selector_upspec_parse(st @@ -1154,7 +1153,6 @@ static int xfrm_selector_upspec_parse(st
switch (sel->proto) { switch (sel->proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: case IPPROTO_UDP:

6
package/iproute2/patches/003-iproute2-htb_overhead.patch
View file

@ -1,7 +1,5 @@
Index: iproute2-2.6.25/tc/q_htb.c --- a/tc/q_htb.c
=================================================================== +++ b/tc/q_htb.c
--- iproute2-2.6.25.orig/tc/q_htb.c 2008-05-01 00:37:50.000000000 +0100
+++ iproute2-2.6.25/tc/q_htb.c 2008-05-01 20:30:28.000000000 +0100
@@ -35,10 +35,14 @@ static void explain(void) @@ -35,10 +35,14 @@ static void explain(void)
" default minor id of class to which unclassified packets are sent {0}\n" " default minor id of class to which unclassified packets are sent {0}\n"
" r2q DRR quantums are computed as rate in Bps/r2q {10}\n" " r2q DRR quantums are computed as rate in Bps/r2q {10}\n"

24
package/iproute2/patches/004-darwin_fixes.patch
View file

@ -1,7 +1,5 @@
Index: iproute-2.6.20-070313/netem/maketable.c --- a/netem/maketable.c
=================================================================== +++ b/netem/maketable.c
--- iproute-2.6.20-070313.orig/netem/maketable.c 2007-06-09 13:53:56.000000000 +0100
+++ iproute-2.6.20-070313/netem/maketable.c 2007-06-09 13:54:01.000000000 +0100
@@ -10,7 +10,9 @@ @@ -10,7 +10,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -12,10 +10,8 @@ Index: iproute-2.6.20-070313/netem/maketable.c
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
Index: iproute-2.6.20-070313/netem/normal.c --- a/netem/normal.c
=================================================================== +++ b/netem/normal.c
--- iproute-2.6.20-070313.orig/netem/normal.c 2007-06-09 13:53:56.000000000 +0100
+++ iproute-2.6.20-070313/netem/normal.c 2007-06-09 13:54:01.000000000 +0100
@@ -8,8 +8,12 @@ @@ -8,8 +8,12 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
@ -29,10 +25,8 @@ Index: iproute-2.6.20-070313/netem/normal.c
#define TABLESIZE 16384 #define TABLESIZE 16384
#define TABLEFACTOR NETEM_DIST_SCALE #define TABLEFACTOR NETEM_DIST_SCALE
Index: iproute-2.6.20-070313/netem/pareto.c --- a/netem/pareto.c
=================================================================== +++ b/netem/pareto.c
--- iproute-2.6.20-070313.orig/netem/pareto.c 2007-06-09 13:53:56.000000000 +0100
+++ iproute-2.6.20-070313/netem/pareto.c 2007-06-09 13:54:01.000000000 +0100
@@ -7,8 +7,12 @@ @@ -7,8 +7,12 @@
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>
@ -46,10 +40,8 @@ Index: iproute-2.6.20-070313/netem/pareto.c
static const double a=3.0; static const double a=3.0;
#define TABLESIZE 16384 #define TABLESIZE 16384
Index: iproute-2.6.20-070313/netem/paretonormal.c --- a/netem/paretonormal.c
=================================================================== +++ b/netem/paretonormal.c
--- iproute-2.6.20-070313.orig/netem/paretonormal.c 2007-06-09 13:53:56.000000000 +0100
+++ iproute-2.6.20-070313/netem/paretonormal.c 2007-06-09 13:54:01.000000000 +0100
@@ -15,10 +15,13 @@ @@ -15,10 +15,13 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>

6
package/iproute2/patches/005-flex-generated.patch
View file

@ -1,7 +1,5 @@
Index: iproute-2.6.20-070313/tc/emp_ematch.lex.c --- /dev/null
=================================================================== +++ b/tc/emp_ematch.lex.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ iproute-2.6.20-070313/tc/emp_ematch.lex.c 2007-06-09 13:54:02.000000000 +0100
@@ -0,0 +1,1764 @@ @@ -0,0 +1,1764 @@
+#define yy_create_buffer ematch__create_buffer +#define yy_create_buffer ematch__create_buffer
+#define yy_delete_buffer ematch__delete_buffer +#define yy_delete_buffer ematch__delete_buffer

20
package/iproute2/patches/006-iproute2-tc_esfq.patch
View file

@ -1,7 +1,5 @@
Index: iproute2-2.6.25/include/linux/pkt_sched.h --- a/include/linux/pkt_sched.h
=================================================================== +++ b/include/linux/pkt_sched.h
--- iproute2-2.6.25.orig/include/linux/pkt_sched.h 2008-05-01 00:37:45.000000000 +0100
+++ iproute2-2.6.25/include/linux/pkt_sched.h 2008-05-01 20:30:49.000000000 +0100
@@ -174,8 +174,38 @@ struct tc_sfq_qopt @@ -174,8 +174,38 @@ struct tc_sfq_qopt
* *
* The only reason for this is efficiency, it is possible * The only reason for this is efficiency, it is possible
@ -41,7 +39,7 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h
/* RED section */ /* RED section */
enum enum
@@ -568,8 +598,37 @@ struct tc_sfq_xstats @@ -588,8 +618,37 @@ struct tc_sfq_xstats
* *
* The only reason for this is efficiency, it is possible * The only reason for this is efficiency, it is possible
* to change these parameters in compile time. * to change these parameters in compile time.
@ -79,10 +77,8 @@ Index: iproute2-2.6.25/include/linux/pkt_sched.h
/* RED section */ /* RED section */
enum enum
Index: iproute2-2.6.25/tc/Makefile --- a/tc/Makefile
=================================================================== +++ b/tc/Makefile
--- iproute2-2.6.25.orig/tc/Makefile 2008-05-01 00:30:13.000000000 +0100
+++ iproute2-2.6.25/tc/Makefile 2008-05-01 20:30:49.000000000 +0100
@@ -7,6 +7,7 @@ include ../Config @@ -7,6 +7,7 @@ include ../Config
TCMODULES := TCMODULES :=
TCMODULES += q_fifo.o TCMODULES += q_fifo.o
@ -91,10 +87,8 @@ Index: iproute2-2.6.25/tc/Makefile
TCMODULES += q_red.o TCMODULES += q_red.o
TCMODULES += q_prio.o TCMODULES += q_prio.o
TCMODULES += q_tbf.o TCMODULES += q_tbf.o
Index: iproute2-2.6.25/tc/q_esfq.c --- /dev/null
=================================================================== +++ b/tc/q_esfq.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ iproute2-2.6.25/tc/q_esfq.c 2008-05-01 20:31:09.000000000 +0100
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/* +/*
+ * q_esfq.c ESFQ. + * q_esfq.c ESFQ.

7
package/iproute2/patches/007-version_includes.patch
View file

@ -1,7 +1,6 @@
diff -urN iproute-2.6.20-070313/include/linux/netfilter_ipv4/ip_tables.h iproute-2.6.20-070313.new/include/linux/netfilter_ipv4/ip_tables.h --- a/include/linux/netfilter_ipv4/ip_tables.h
--- iproute-2.6.20-070313/include/linux/netfilter_ipv4/ip_tables.h 2007-03-13 22:50:56.000000000 +0100 +++ b/include/linux/netfilter_ipv4/ip_tables.h
+++ iproute-2.6.20-070313.new/include/linux/netfilter_ipv4/ip_tables.h 2007-06-13 19:50:04.000000000 +0200 @@ -114,7 +114,10 @@ struct ipt_entry
@@ -112,7 +112,10 @@
#define IPT_CONTINUE XT_CONTINUE #define IPT_CONTINUE XT_CONTINUE
#define IPT_RETURN XT_RETURN #define IPT_RETURN XT_RETURN