[brcm47xx] add patches for kernel 2.6.31

[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 34eaeb0..b44ce20 100644 (file)
--- a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
+++ b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
@@ -1,19 +1,18 @@
-diff -Nur iproute2-2.6.11-050330/ip/ipxfrm.c iproute2-2.6.11-050330.new/ip/ipxfrm.c
---- iproute2-2.6.11-050330/ip/ipxfrm.c 2005-04-01 21:58:11.000000000 +0200
-+++ iproute2-2.6.11-050330.new/ip/ipxfrm.c     2005-05-27 12:27:44.000000000 +0200
-@@ -444,7 +444,6 @@
+--- a/ip/ipxfrm.c
++++ b/ip/ipxfrm.c
+@@ -491,7 +491,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 @@
+@@ -1154,7 +1153,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));