diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-18 15:13:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-18 15:13:31 +0000 |
| commit | 8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64 (patch) | |
| tree | 3df2b47f3587083c82f47e68c586d41cc2c663ba /target/linux/generic/patches-3.7 | |
| parent | b2caa5db248f8a212de2c0adc9835d2949db75ff (diff) | |
| download | upstream-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.tar.gz upstream-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.tar.bz2 upstream-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.zip | |
kernel: update linux 3.7 to 3.7.1
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34760
Diffstat (limited to 'target/linux/generic/patches-3.7')
3 files changed, 8 insertions, 14 deletions
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 676d78ec25..210f7fb6b3 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 @@ -1,5 +1,3 @@ -diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h -index 387bdd0..ba7f571 100644 --- a/include/linux/netfilter/nf_conntrack_sip.h +++ b/include/linux/netfilter/nf_conntrack_sip.h @@ -4,12 +4,15 @@ @@ -18,11 +16,9 @@ index 387bdd0..ba7f571 100644 }; enum sip_expectation_classes { -diff --git a/net/netfilter/nf_nat_sip.c b/net/netfilter/nf_nat_sip.c -index 16303c7..552e270 100644 --- a/net/netfilter/nf_nat_sip.c +++ b/net/netfilter/nf_nat_sip.c -@@ -95,6 +95,7 @@ static int map_addr(struct sk_buff *skb, unsigned int protoff, +@@ -95,6 +95,7 @@ static int map_addr(struct sk_buff *skb, enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); @@ -30,7 +26,7 @@ index 16303c7..552e270 100644 char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; union nf_inet_addr newaddr; -@@ -107,7 +108,8 @@ static int map_addr(struct sk_buff *skb, unsigned int protoff, +@@ -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; @@ -40,7 +36,7 @@ index 16303c7..552e270 100644 } else return 1; -@@ -144,6 +146,7 @@ static unsigned int nf_nat_sip(struct sk_buff *skb, unsigned int protoff, +@@ -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); @@ -69,7 +65,7 @@ index 16303c7..552e270 100644 return NF_ACCEPT; } -@@ -311,8 +328,10 @@ static unsigned int nf_nat_sip_expect(struct sk_buff *skb, unsigned int protoff, +@@ -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); @@ -80,7 +76,7 @@ index 16303c7..552e270 100644 char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; -@@ -326,8 +345,9 @@ static unsigned int nf_nat_sip_expect(struct sk_buff *skb, unsigned int protoff, +@@ -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. */ @@ -92,11 +88,9 @@ index 16303c7..552e270 100644 port = ntohs(ct->tuplehash[!dir].tuple.dst.u.udp.port); else port = ntohs(exp->tuple.dst.u.udp.port); -diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c -index df8f4f2..72a67bb 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c -@@ -1440,8 +1440,25 @@ static int process_sip_request(struct sk_buff *skb, unsigned int protoff, +@@ -1440,8 +1440,25 @@ static int process_sip_request(struct sk { enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); diff --git a/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch b/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch index 119760648d..4065f8aeae 100644 --- a/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch +++ b/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch @@ -12,7 +12,7 @@ help --- a/net/core/Makefile +++ b/net/core/Makefile -@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o +@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o obj-$(CONFIG_SYSCTL) += sysctl_net_core.o obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \ diff --git a/target/linux/generic/patches-3.7/941-ocf_20120127.patch b/target/linux/generic/patches-3.7/941-ocf_20120127.patch index 46fd02a2fc..326471421c 100644 --- a/target/linux/generic/patches-3.7/941-ocf_20120127.patch +++ b/target/linux/generic/patches-3.7/941-ocf_20120127.patch @@ -90,7 +90,7 @@ * Entropy extraction routines --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -146,6 +146,7 @@ pid_t f_getown(struct file *filp) +@@ -148,6 +148,7 @@ pid_t f_getown(struct file *filp) read_unlock(&filp->f_owner.lock); return pid; } |