[mac80211] Update to compat-wireless-2009-06-02

[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 34eaeb055353861336cf0089915625bbda1754ee..1a07d86adcebaeed45be3de04b7a0c88286b0103 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,20 @@
-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 @@
+Index: iproute2-2.6.25/ip/ipxfrm.c
+===================================================================
+--- 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:
+       case IPPROTO_DCCP:
        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:
+               case IPPROTO_DCCP:
                        break;
                default:
-                       fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));