diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:47:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:47:39 +0000 |
| commit | def14d6adca22c2e9fb6c9e0cc6431eb09424d30 (patch) | |
| tree | 2304bb5c88d8eace6555b6ec24516d10f01b5d79 /target/linux/generic/patches-3.6 | |
| parent | 5a96c5fd94c7ef3516c0e4da3a5b3c0713f468b2 (diff) | |
| download | upstream-def14d6adca22c2e9fb6c9e0cc6431eb09424d30.tar.gz upstream-def14d6adca22c2e9fb6c9e0cc6431eb09424d30.tar.bz2 upstream-def14d6adca22c2e9fb6c9e0cc6431eb09424d30.zip | |
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.6')
3 files changed, 5 insertions, 15 deletions
diff --git a/target/linux/generic/patches-3.6/084-perf_mkstemp_build_fix.patch b/target/linux/generic/patches-3.6/084-perf_mkstemp_build_fix.patch index 1ded1374f5..e95e11ba6a 100644 --- a/target/linux/generic/patches-3.6/084-perf_mkstemp_build_fix.patch +++ b/target/linux/generic/patches-3.6/084-perf_mkstemp_build_fix.patch @@ -22,8 +22,6 @@ Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> tools/perf/util/dso-test-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/perf/util/dso-test-data.c b/tools/perf/util/dso-test-data.c -index 541cdc7..c6caede 100644 --- a/tools/perf/util/dso-test-data.c +++ b/tools/perf/util/dso-test-data.c @@ -23,7 +23,7 @@ static char *test_file(int size) @@ -35,6 +33,3 @@ index 541cdc7..c6caede 100644 buf = malloc(size); if (!buf) { --- -1.7.10.4 - diff --git a/target/linux/generic/patches-3.6/084-x86_fix_perf_uclibc_build.patch b/target/linux/generic/patches-3.6/084-x86_fix_perf_uclibc_build.patch index d2b550460a..95163a43ae 100644 --- a/target/linux/generic/patches-3.6/084-x86_fix_perf_uclibc_build.patch +++ b/target/linux/generic/patches-3.6/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.6/604-netfilter_cisco_794x_iphone.patch b/target/linux/generic/patches-3.6/604-netfilter_cisco_794x_iphone.patch index 418a645d68..ee8ba1a66c 100644 --- a/target/linux/generic/patches-3.6/604-netfilter_cisco_794x_iphone.patch +++ b/target/linux/generic/patches-3.6/604-netfilter_cisco_794x_iphone.patch @@ -26,7 +26,7 @@ char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")]; unsigned int buflen; __be32 newaddr; -@@ -85,7 +88,8 @@ static int map_addr(struct sk_buff *skb, +@@ -85,7 +86,8 @@ static int map_addr(struct sk_buff *skb, } else if (ct->tuplehash[dir].tuple.dst.u3.ip == addr->ip && ct->tuplehash[dir].tuple.dst.u.udp.port == port) { newaddr = ct->tuplehash[!dir].tuple.src.u3.ip; @@ -36,7 +36,7 @@ } else return 1; -@@ -121,6 +125,7 @@ static unsigned int ip_nat_sip(struct sk +@@ -121,6 +123,7 @@ static unsigned int ip_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; -@@ -230,6 +235,20 @@ next: +@@ -230,6 +233,20 @@ next: !map_sip_addr(skb, dataoff, dptr, datalen, SIP_HDR_TO)) return NF_DROP; @@ -65,7 +65,7 @@ return NF_ACCEPT; } -@@ -281,8 +302,10 @@ static unsigned int ip_nat_sip_expect(st +@@ -281,8 +298,10 @@ static unsigned int ip_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[sizeof("nnn.nnn.nnn.nnn:nnnnn")]; unsigned int buflen; -@@ -295,8 +319,9 @@ static unsigned int ip_nat_sip_expect(st +@@ -295,8 +314,9 @@ static unsigned int ip_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. */ |