diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 22:42:22 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 22:42:22 +0000 |
commit | 8f047925312e05a622919181a045cf8ae3ed5616 (patch) | |
tree | 942454f253f4013c4e510d5acd63d109289ddae6 /target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | |
parent | 36e6d4ca53495970956c697c8549d16ceb998242 (diff) | |
download | upstream-8f047925312e05a622919181a045cf8ae3ed5616.tar.gz upstream-8f047925312e05a622919181a045cf8ae3ed5616.tar.bz2 upstream-8f047925312e05a622919181a045cf8ae3ed5616.zip |
kernel: update to linux 3.10.4, refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37617
Diffstat (limited to 'target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | 22 |
1 files changed, 11 insertions, 11 deletions
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 72cff92840..0a5ca2659d 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 @@ -56,7 +56,7 @@ err = -EINVAL; --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c -@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX +@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX .error = -EINVAL, .scope = RT_SCOPE_NOWHERE, }, @@ -112,7 +112,7 @@ return -EINVAL; --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -245,6 +245,24 @@ static const struct rt6_info ip6_prohibi +@@ -251,6 +251,24 @@ static const struct rt6_info ip6_prohibi .rt6i_ref = ATOMIC_INIT(1), }; @@ -137,7 +137,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -1459,6 +1477,9 @@ int ip6_route_add(struct fib6_config *cf +@@ -1481,6 +1499,9 @@ int ip6_route_add(struct fib6_config *cf case RTN_THROW: rt->dst.error = -EAGAIN; break; @@ -147,7 +147,7 @@ default: rt->dst.error = -ENETUNREACH; break; -@@ -2035,6 +2056,17 @@ static int ip6_pkt_prohibit_out(struct s +@@ -2057,6 +2078,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -165,7 +165,7 @@ #endif /* -@@ -2240,7 +2272,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2262,7 +2294,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 || @@ -175,7 +175,7 @@ cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2442,6 +2475,9 @@ static int rt6_fill_node(struct net *net +@@ -2464,6 +2497,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -185,7 +185,7 @@ case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2692,6 +2728,8 @@ static int ip6_route_dev_notify(struct n +@@ -2714,6 +2750,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); @@ -194,7 +194,7 @@ net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -2952,6 +2990,17 @@ static int __net_init ip6_route_net_init +@@ -2974,6 +3012,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); @@ -212,7 +212,7 @@ #endif net->ipv6.sysctl.flush_delay = 0; -@@ -2970,6 +3019,8 @@ out: +@@ -2992,6 +3041,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -221,7 +221,7 @@ out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -2987,6 +3038,7 @@ static void __net_exit ip6_route_net_exi +@@ -3009,6 +3060,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); @@ -229,7 +229,7 @@ #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3083,6 +3135,9 @@ int __init ip6_route_init(void) +@@ -3105,6 +3157,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); |