generic: refresh patches

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34676

6 files changed, 10 insertions, 30 deletions

diff --git a/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch b/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch
index d2b550460a..95163a43ae 100644
--- a/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch
+++ b/target/linux/generic/patches-3.3/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/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. */
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 d2b550460a..95163a43ae 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 6aaf71b809..d9505e0aa1 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. */