b43: merge ad-hoc beacon fix

[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 11c1917..cf2c9e9 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,10 @@
-Index: iproute-2.6.20-070313/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 @@
+---
+ ip/ipxfrm.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/ip/ipxfrm.c
++++ b/ip/ipxfrm.c
+@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel
        switch (sel->proto) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
@@ -10,7 +12,7 @@ Index: iproute-2.6.20-070313/ip/ipxfrm.c
        case IPPROTO_DCCP:
        default: /* XXX */
                if (sel->sport_mask)
-@@ -1107,7 +1106,6 @@
+@@ -1172,7 +1171,6 @@ static int xfrm_selector_upspec_parse(st
                switch (sel->proto) {
                case IPPROTO_TCP:
                case IPPROTO_UDP: