diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-14 08:47:39 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-14 08:47:39 +0000 |
| commit | 3ff0f92d17a5ee0c42883ffa7bc947db5ab19539 (patch) | |
| tree | 2304bb5c88d8eace6555b6ec24516d10f01b5d79 /target/linux/generic/patches-3.7 | |
| parent | a9b0d992c3d791d14133f6507b9fe4e8b34f316a (diff) | |
generic: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34676 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7')
| -rw-r--r-- | target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch | 5 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch b/target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch index d2b550460..95163a43a 100644 --- a/target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch +++ b/target/linux/generic/patches-3.7/084-x86_fix_perf_uclibc_build.patch @@ -12,8 +12,6 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> tools/perf/arch/x86/util/dwarf-regs.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c -index a794d30..6f5267f 100644 --- a/tools/perf/arch/x86/util/dwarf-regs.c +++ b/tools/perf/arch/x86/util/dwarf-regs.c @@ -20,7 +20,10 @@ @@ -27,6 +25,3 @@ index a794d30..6f5267f 100644 #include <dwarf-regs.h> /* --- -1.7.10.4 - diff --git a/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch b/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch index 6aaf71b80..d9505e0aa 100644 --- a/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch +++ b/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch @@ -26,7 +26,7 @@ char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; union nf_inet_addr newaddr; -@@ -107,7 +110,8 @@ static int map_addr(struct sk_buff *skb, +@@ -107,7 +108,8 @@ static int map_addr(struct sk_buff *skb, } else if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.dst.u3, addr) && ct->tuplehash[dir].tuple.dst.u.udp.port == port) { newaddr = ct->tuplehash[!dir].tuple.src.u3; @@ -36,7 +36,7 @@ } else return 1; -@@ -144,6 +148,7 @@ static unsigned int nf_nat_sip(struct sk +@@ -144,6 +146,7 @@ static unsigned int nf_nat_sip(struct sk enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); @@ -44,7 +44,7 @@ unsigned int coff, matchoff, matchlen; enum sip_header_types hdr; union nf_inet_addr addr; -@@ -258,6 +263,20 @@ next: +@@ -258,6 +261,20 @@ next: !map_sip_addr(skb, protoff, dataoff, dptr, datalen, SIP_HDR_TO)) return NF_DROP; @@ -65,7 +65,7 @@ return NF_ACCEPT; } -@@ -311,8 +332,10 @@ static unsigned int nf_nat_sip_expect(st +@@ -311,8 +328,10 @@ static unsigned int nf_nat_sip_expect(st enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); @@ -76,7 +76,7 @@ char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; -@@ -326,8 +350,9 @@ static unsigned int nf_nat_sip_expect(st +@@ -326,8 +345,9 @@ static unsigned int nf_nat_sip_expect(st /* If the signalling port matches the connection's source port in the * original direction, try to use the destination port in the opposite * direction. */ |