Update iproute2 to version 2.6.25, and fixup patches

[openwrt-10.03/.git] / package / iproute2 / patches / 002-iproute2-ipxfrm_no_sctp.patch

diff --git a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
index 11c1917755cb0f631883e5256a22571ce6e24e09..1a07d86adcebaeed45be3de04b7a0c88286b0103 100644 (file)
--- a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
+++ b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
@@ -1,8 +1,8 @@
-Index: iproute-2.6.20-070313/ip/ipxfrm.c
+Index: iproute2-2.6.25/ip/ipxfrm.c
 ===================================================================
---- iproute-2.6.20-070313.orig/ip/ipxfrm.c     2007-06-09 13:53:56.000000000 +0100
-+++ iproute-2.6.20-070313/ip/ipxfrm.c  2007-06-09 13:53:59.000000000 +0100
-@@ -467,7 +467,6 @@
+--- iproute2-2.6.25.orig/ip/ipxfrm.c   2008-04-17 18:12:54.000000000 +0100
++++ 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) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
@@ -10,7 +10,7 @@ Index: iproute-2.6.20-070313/ip/ipxfrm.c
        case IPPROTO_DCCP:
        default: /* XXX */
                if (sel->sport_mask)
-@@ -1107,7 +1106,6 @@
+@@ -1121,7 +1120,6 @@ static int xfrm_selector_upspec_parse(st
                switch (sel->proto) {
                case IPPROTO_TCP:
                case IPPROTO_UDP: