Changeset 34676


Ignore:
Timestamp:
2012-12-14T09:47:39+01:00 (5 years ago)
Author:
juhosg
Message:

generic: refresh patches

Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk/target/linux/generic
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch

    r34666 r34676  
    1313 1 file changed, 3 insertions(+) 
    1414 
    15 diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c 
    16 index a794d30..6f5267f 100644 
    1715--- a/tools/perf/arch/x86/util/dwarf-regs.c 
    1816+++ b/tools/perf/arch/x86/util/dwarf-regs.c 
     
    2826  
    2927 /* 
    30 --  
    31 1.7.10.4 
    32  
  • trunk/target/linux/generic/patches-3.6/084-perf_mkstemp_build_fix.patch

    r34662 r34676  
    2323 1 file changed, 1 insertion(+), 1 deletion(-) 
    2424 
    25 diff --git a/tools/perf/util/dso-test-data.c b/tools/perf/util/dso-test-data.c 
    26 index 541cdc7..c6caede 100644 
    2725--- a/tools/perf/util/dso-test-data.c 
    2826+++ b/tools/perf/util/dso-test-data.c 
     
    3634        buf = malloc(size); 
    3735        if (!buf) { 
    38 --  
    39 1.7.10.4 
    40  
  • trunk/target/linux/generic/patches-3.6/084-x86_fix_perf_uclibc_build.patch

    r34666 r34676  
    1313 1 file changed, 3 insertions(+) 
    1414 
    15 diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c 
    16 index a794d30..6f5267f 100644 
    1715--- a/tools/perf/arch/x86/util/dwarf-regs.c 
    1816+++ b/tools/perf/arch/x86/util/dwarf-regs.c 
     
    2826  
    2927 /* 
    30 --  
    31 1.7.10.4 
    32  
  • trunk/target/linux/generic/patches-3.6/604-netfilter_cisco_794x_iphone.patch

    r34657 r34676  
    2727        unsigned int buflen; 
    2828        __be32 newaddr; 
    29 @@ -85,7 +88,8 @@ static int map_addr(struct sk_buff *skb, 
     29@@ -85,7 +86,8 @@ static int map_addr(struct sk_buff *skb, 
    3030        } else if (ct->tuplehash[dir].tuple.dst.u3.ip == addr->ip && 
    3131                   ct->tuplehash[dir].tuple.dst.u.udp.port == port) { 
     
    3737                return 1; 
    3838  
    39 @@ -121,6 +125,7 @@ static unsigned int ip_nat_sip(struct sk 
     39@@ -121,6 +123,7 @@ static unsigned int ip_nat_sip(struct sk 
    4040        enum ip_conntrack_info ctinfo; 
    4141        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
     
    4545        enum sip_header_types hdr; 
    4646        union nf_inet_addr addr; 
    47 @@ -230,6 +235,20 @@ next: 
     47@@ -230,6 +233,20 @@ next: 
    4848            !map_sip_addr(skb, dataoff, dptr, datalen, SIP_HDR_TO)) 
    4949                return NF_DROP; 
     
    6666 } 
    6767  
    68 @@ -281,8 +302,10 @@ static unsigned int ip_nat_sip_expect(st 
     68@@ -281,8 +298,10 @@ static unsigned int ip_nat_sip_expect(st 
    6969        enum ip_conntrack_info ctinfo; 
    7070        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
     
    7777        unsigned int buflen; 
    7878  
    79 @@ -295,8 +319,9 @@ static unsigned int ip_nat_sip_expect(st 
     79@@ -295,8 +314,9 @@ static unsigned int ip_nat_sip_expect(st 
    8080        /* If the signalling port matches the connection's source port in the 
    8181         * original direction, try to use the destination port in the opposite 
  • trunk/target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch

    r34666 r34676  
    1313 1 file changed, 3 insertions(+) 
    1414 
    15 diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c 
    16 index a794d30..6f5267f 100644 
    1715--- a/tools/perf/arch/x86/util/dwarf-regs.c 
    1816+++ b/tools/perf/arch/x86/util/dwarf-regs.c 
     
    2826  
    2927 /* 
    30 --  
    31 1.7.10.4 
    32  
  • trunk/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch

    r34657 r34676  
    2727        unsigned int buflen; 
    2828        union nf_inet_addr newaddr; 
    29 @@ -107,7 +110,8 @@ static int map_addr(struct sk_buff *skb, 
     29@@ -107,7 +108,8 @@ static int map_addr(struct sk_buff *skb, 
    3030        } else if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.dst.u3, addr) && 
    3131                   ct->tuplehash[dir].tuple.dst.u.udp.port == port) { 
     
    3737                return 1; 
    3838  
    39 @@ -144,6 +148,7 @@ static unsigned int nf_nat_sip(struct sk 
     39@@ -144,6 +146,7 @@ static unsigned int nf_nat_sip(struct sk 
    4040        enum ip_conntrack_info ctinfo; 
    4141        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
     
    4545        enum sip_header_types hdr; 
    4646        union nf_inet_addr addr; 
    47 @@ -258,6 +263,20 @@ next: 
     47@@ -258,6 +261,20 @@ next: 
    4848            !map_sip_addr(skb, protoff, dataoff, dptr, datalen, SIP_HDR_TO)) 
    4949                return NF_DROP; 
     
    6666 } 
    6767  
    68 @@ -311,8 +332,10 @@ static unsigned int nf_nat_sip_expect(st 
     68@@ -311,8 +328,10 @@ static unsigned int nf_nat_sip_expect(st 
    6969        enum ip_conntrack_info ctinfo; 
    7070        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
     
    7777        unsigned int buflen; 
    7878  
    79 @@ -326,8 +350,9 @@ static unsigned int nf_nat_sip_expect(st 
     79@@ -326,8 +345,9 @@ static unsigned int nf_nat_sip_expect(st 
    8080        /* If the signalling port matches the connection's source port in the 
    8181         * original direction, try to use the destination port in the opposite 
Note: See TracChangeset for help on using the changeset viewer.