Changeset 24216


Ignore:
Timestamp:
2010-12-02T21:29:22+01:00 (7 years ago)
Author:
jow
Message:

[package] iproute2: dont filter cached routes on iproute_get (#8339)

Location:
trunk/package/iproute2
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iproute2/Makefile

    r23250 r24216  
    1010PKG_NAME:=iproute2 
    1111PKG_VERSION:=2.6.35 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • trunk/package/iproute2/patches/000-debian_patches_3.patch

    r23027 r24216  
    1111 9 files changed, 1177 insertions(+), 5 deletions(-) 
    1212 
    13 --- iproute2-2.6.35.orig/doc/ip-cref.tex 
    14 +++ iproute2-2.6.35/doc/ip-cref.tex 
     13--- a/doc/ip-cref.tex 
     14+++ b/doc/ip-cref.tex 
    1515@@ -1307,6 +1307,19 @@ peers are allowed to send to us. 
    1616 --- \threeonly the clamp for congestion window. It is ignored if the \verb|lock| 
     
    3333 \item \verb|advmss NUMBER| 
    3434  
    35 @@ -2664,6 +2677,9 @@ http://www.cisco.com/univercd/cc/td/doc/ 
    36   
     35@@ -2665,6 +2678,9 @@ http://www.cisco.com/univercd/cc/td/doc/ 
    3736 \bibitem{RFC2414}  M.~Allman, S.~Floyd, C.~Partridge. 
    3837 ``Increasing TCP's Initial Window'', RFC-2414. 
    39 + 
     38  
    4039+\bibitem{RFC2414}  M.~Allman, S.~Floyd, C.~Partridge. 
    4140+``Increasing TCP's Initial Window'', RFC-2414. 
    42   
     41+ 
    4342 \end{thebibliography} 
    4443  
    45 --- iproute2-2.6.35.orig/doc/Makefile 
    46 +++ iproute2-2.6.35/doc/Makefile 
     44  
     45--- a/doc/Makefile 
     46+++ b/doc/Makefile 
    4747@@ -14,6 +14,7 @@ PAGESIZE=a4 
    4848 PAGESPERPAGE=2 
     
    7676-       rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html 
    7777+       rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES) 
    78 --- iproute2-2.6.35.orig/include/linux/pkt_sched.h 
    79 +++ iproute2-2.6.35/include/linux/pkt_sched.h 
     78--- a/include/linux/pkt_sched.h 
     79+++ b/include/linux/pkt_sched.h 
    8080@@ -1,3 +1,409 @@ 
    8181+#if 0 
     
    605605+ 
    606606 #endif 
    607 --- iproute2-2.6.35.orig/ip/iptunnel.c 
    608 +++ iproute2-2.6.35/ip/iptunnel.c 
     607--- a/ip/iptunnel.c 
     608+++ b/ip/iptunnel.c 
    609609@@ -130,7 +130,7 @@ static int parse_args(int argc, char **a 
    610610                        NEXT_ARG(); 
     
    616616                                if (get_unsigned(&uval, *argv, 0)<0) { 
    617617                                        fprintf(stderr, "invalid value of \"okey\"\n"); 
    618 --- iproute2-2.6.35.orig/Makefile 
    619 +++ iproute2-2.6.35/Makefile 
     618--- a/Makefile 
     619+++ b/Makefile 
    620620@@ -57,7 +57,7 @@ install: all 
    621621                $(DESTDIR)$(DOCDIR)/examples 
     
    636636  
    637637 clobber: clean 
    638 --- iproute2-2.6.35.orig/misc/Makefile 
    639 +++ iproute2-2.6.35/misc/Makefile 
     638--- a/misc/Makefile 
     639+++ b/misc/Makefile 
    640640@@ -1,7 +1,8 @@ 
    641641 SSOBJ=ss.o ssfilter.o 
     
    648648 include ../Config 
    649649  
    650 --- iproute2-2.6.35.orig/tc/Makefile 
    651 +++ iproute2-2.6.35/tc/Makefile 
     650--- a/tc/Makefile 
     651+++ b/tc/Makefile 
    652652@@ -15,6 +15,7 @@ TCMODULES += q_cbq.o 
    653653 TCMODULES += q_rr.o 
     
    658658 TCMODULES += f_u32.o 
    659659 TCMODULES += f_route.o 
    660 --- iproute2-2.6.35.orig/tc/q_htb.c 
    661 +++ iproute2-2.6.35/tc/q_htb.c 
     660--- a/tc/q_htb.c 
     661+++ b/tc/q_htb.c 
    662662@@ -1,3 +1,311 @@ 
    663663+#if 0 
     
    973973  * 
    974974--- /dev/null 
    975 +++ iproute2-2.6.35/tc/q_wrr.c 
     975+++ b/tc/q_wrr.c 
    976976@@ -0,0 +1,322 @@ 
    977977+#include <stdio.h> 
  • trunk/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch

    r23027 r24216  
    33 1 file changed, 2 deletions(-) 
    44 
    5 --- iproute2-2.6.35.orig/ip/ipxfrm.c 
    6 +++ iproute2-2.6.35/ip/ipxfrm.c 
     5--- a/ip/ipxfrm.c 
     6+++ b/ip/ipxfrm.c 
    77@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel 
    88        switch (sel->proto) { 
  • trunk/package/iproute2/patches/006-iproute2-tc_esfq.patch

    r23027 r24216  
    55 3 files changed, 260 insertions(+) 
    66 
    7 --- iproute2-2.6.35.orig/include/linux/pkt_sched.h 
    8 +++ iproute2-2.6.35/include/linux/pkt_sched.h 
     7--- a/include/linux/pkt_sched.h 
     8+++ b/include/linux/pkt_sched.h 
    99@@ -174,8 +174,38 @@ struct tc_sfq_qopt 
    1010  * 
     
    8484  
    8585 enum { 
    86 --- iproute2-2.6.35.orig/tc/Makefile 
    87 +++ iproute2-2.6.35/tc/Makefile 
     86--- a/tc/Makefile 
     87+++ b/tc/Makefile 
    8888@@ -8,6 +8,7 @@ SHARED_LIBS ?= y 
    8989 TCMODULES := 
     
    9595 TCMODULES += q_tbf.o 
    9696--- /dev/null 
    97 +++ iproute2-2.6.35/tc/q_esfq.c 
     97+++ b/tc/q_esfq.c 
    9898@@ -0,0 +1,200 @@ 
    9999+/* 
  • trunk/package/iproute2/patches/007-version_includes.patch

    r23027 r24216  
    33 1 file changed, 3 insertions(+) 
    44 
    5 --- iproute2-2.6.35.orig/include/linux/netfilter_ipv4/ip_tables.h 
    6 +++ iproute2-2.6.35/include/linux/netfilter_ipv4/ip_tables.h 
     5--- a/include/linux/netfilter_ipv4/ip_tables.h 
     6+++ b/include/linux/netfilter_ipv4/ip_tables.h 
    77@@ -113,7 +113,10 @@ struct ipt_entry { 
    88 #define IPT_CONTINUE XT_CONTINUE 
  • trunk/package/iproute2/patches/100-allow_pfifo_fast.patch

    r23027 r24216  
    33 1 file changed, 1 insertion(+) 
    44 
    5 --- iproute2-2.6.35.orig/tc/q_fifo.c 
    6 +++ iproute2-2.6.35/tc/q_fifo.c 
     5--- a/tc/q_fifo.c 
     6+++ b/tc/q_fifo.c 
    77@@ -98,5 +98,6 @@ struct qdisc_util pfifo_head_drop_qdisc_ 
    88 extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt); 
Note: See TracChangeset for help on using the changeset viewer.