diff options
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 | 18 |
1 files changed, 9 insertions, 9 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 ddd3f74..277a50e 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), -@@ -1509,6 +1527,11 @@ int ip6_route_add(struct fib6_config *cf +@@ -1510,6 +1528,11 @@ int ip6_route_add(struct fib6_config *cf rt->dst.output = ip6_pkt_prohibit_out; rt->dst.input = ip6_pkt_prohibit; break; @@ -139,7 +139,7 @@ case RTN_THROW: default: rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN -@@ -2088,6 +2111,17 @@ static int ip6_pkt_prohibit_out(struct s +@@ -2089,6 +2112,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -157,7 +157,7 @@ /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -2290,7 +2324,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2291,7 +2325,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 || @@ -167,7 +167,7 @@ cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2492,6 +2527,9 @@ static int rt6_fill_node(struct net *net +@@ -2493,6 +2528,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -177,7 +177,7 @@ case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2742,6 +2780,8 @@ static int ip6_route_dev_notify(struct n +@@ -2743,6 +2781,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); @@ -186,7 +186,7 @@ net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -3002,6 +3042,17 @@ static int __net_init ip6_route_net_init +@@ -3003,6 +3043,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); @@ -204,7 +204,7 @@ #endif net->ipv6.sysctl.flush_delay = 0; -@@ -3020,6 +3071,8 @@ out: +@@ -3021,6 +3072,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -213,7 +213,7 @@ out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -3037,6 +3090,7 @@ static void __net_exit ip6_route_net_exi +@@ -3038,6 +3091,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); @@ -221,7 +221,7 @@ #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3133,6 +3187,9 @@ int __init ip6_route_init(void) +@@ -3134,6 +3188,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); |