diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
commit | 35656042f1cd457819a75c980613634b494a7e70 (patch) | |
tree | f7999960f435d3eeacf3bc222cf249f3df368969 /target/linux/generic/patches-3.10 | |
parent | cb07269988cd3be7cbbd3278081c5688ae8d7616 (diff) | |
download | master-31e0f0ae-35656042f1cd457819a75c980613634b494a7e70.tar.gz master-31e0f0ae-35656042f1cd457819a75c980613634b494a7e70.tar.bz2 master-31e0f0ae-35656042f1cd457819a75c980613634b494a7e70.zip |
kernel: update 3.10 to 3.10.18
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38652
Diffstat (limited to 'target/linux/generic/patches-3.10')
5 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/generic/patches-3.10/655-increase_skb_pad.patch b/target/linux/generic/patches-3.10/655-increase_skb_pad.patch index 6e10a1ace4..590fa1686c 100644 --- a/target/linux/generic/patches-3.10/655-increase_skb_pad.patch +++ b/target/linux/generic/patches-3.10/655-increase_skb_pad.patch @@ -1,6 +1,6 @@ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1848,7 +1848,7 @@ static inline int pskb_network_may_pull( +@@ -1853,7 +1853,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch b/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch index 59cfa6a3b6..86b7e1ff3b 100644 --- a/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch +++ b/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch @@ -14,7 +14,7 @@ when needed. --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1893,6 +1893,24 @@ static inline void pskb_trim_unique(stru +@@ -1898,6 +1898,24 @@ static inline void pskb_trim_unique(stru BUG_ON(err); } diff --git a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 556adcc935..4614d8ebaf 100644 --- a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -127,7 +127,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -1481,6 +1499,9 @@ int ip6_route_add(struct fib6_config *cf +@@ -1505,6 +1523,9 @@ int ip6_route_add(struct fib6_config *cf case RTN_THROW: rt->dst.error = -EAGAIN; break; @@ -137,7 +137,7 @@ default: rt->dst.error = -ENETUNREACH; break; -@@ -2057,6 +2078,17 @@ static int ip6_pkt_prohibit_out(struct s +@@ -2084,6 +2105,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -155,7 +155,7 @@ #endif /* -@@ -2262,7 +2294,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2290,7 +2322,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -165,7 +165,7 @@ cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2464,6 +2497,9 @@ static int rt6_fill_node(struct net *net +@@ -2492,6 +2525,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -175,7 +175,7 @@ case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2714,6 +2750,8 @@ static int ip6_route_dev_notify(struct n +@@ -2742,6 +2778,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -184,7 +184,7 @@ net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -2974,6 +3012,17 @@ static int __net_init ip6_route_net_init +@@ -3002,6 +3040,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -202,7 +202,7 @@ #endif net->ipv6.sysctl.flush_delay = 0; -@@ -2992,6 +3041,8 @@ out: +@@ -3020,6 +3069,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -211,7 +211,7 @@ out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -3009,6 +3060,7 @@ static void __net_exit ip6_route_net_exi +@@ -3037,6 +3088,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -219,7 +219,7 @@ #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3105,6 +3157,9 @@ int __init ip6_route_init(void) +@@ -3133,6 +3185,9 @@ int __init ip6_route_init(void) init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/target/linux/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch index 869200787f..f678ef42e2 100644 --- a/target/linux/generic/patches-3.10/721-phy_packets.patch +++ b/target/linux/generic/patches-3.10/721-phy_packets.patch @@ -34,7 +34,7 @@ #define IF_GET_IFACE 0x0001 /* for querying only */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1878,6 +1878,10 @@ static inline int pskb_trim(struct sk_bu +@@ -1883,6 +1883,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -45,7 +45,7 @@ /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2002,16 +2006,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2007,16 +2011,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch index d3d6aaaca4..fd50eb1a28 100644 --- a/target/linux/generic/patches-3.10/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch @@ -173,7 +173,7 @@ goto err; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2838,6 +2838,8 @@ static __net_initdata struct pernet_oper +@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { |