resync ixp4xx 2.6.30 patches with -rc3

[openwrt.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 fd7b22b..1a07d86 100644 (file)
--- a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
+++ b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
@@ -1,20 +1,20 @@
-Index: iproute2-2.6.15-060110/ip/ipxfrm.c
+Index: iproute2-2.6.25/ip/ipxfrm.c

 ===================================================================
 ===================================================================

---- iproute2-2.6.15-060110.orig/ip/ipxfrm.c    2007-06-04 13:22:33.399777744 +0200
-+++ iproute2-2.6.15-060110/ip/ipxfrm.c 2007-06-04 13:22:34.104670584 +0200
-@@ -444,7 +444,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:
 -      case IPPROTO_SCTP:
        switch (sel->proto) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
 -      case IPPROTO_SCTP:

+       case IPPROTO_DCCP:

        default: /* XXX */
                if (sel->sport_mask)
        default: /* XXX */
                if (sel->sport_mask)

-                       fprintf(fp, "sport %u ", ntohs(sel->sport));
-@@ -998,7 +997,6 @@
+@@ -1121,7 +1120,6 @@ static int xfrm_selector_upspec_parse(st

                switch (sel->proto) {
                case IPPROTO_TCP:
                case IPPROTO_UDP:
 -              case IPPROTO_SCTP:
                switch (sel->proto) {
                case IPPROTO_TCP:
                case IPPROTO_UDP:
 -              case IPPROTO_SCTP:

+               case IPPROTO_DCCP:

                        break;
                default:
                        break;
                default:

-                       fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));