|
|
|
@ -141,7 +141,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
|
|
|
.dst = {
|
|
|
|
|
.__refcnt = ATOMIC_INIT(1),
|
|
|
|
|
@@ -1967,6 +1984,11 @@ static struct rt6_info *ip6_route_info_c
|
|
|
|
|
@@ -1970,6 +1987,11 @@ static struct rt6_info *ip6_route_info_c
|
|
|
|
|
rt->dst.output = ip6_pkt_prohibit_out;
|
|
|
|
|
rt->dst.input = ip6_pkt_prohibit;
|
|
|
|
|
break;
|
|
|
|
@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
case -EAGAIN:
|
|
|
|
|
rtm->rtm_type = RTN_THROW;
|
|
|
|
|
break;
|
|
|
|
|
@@ -3490,6 +3527,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -3498,6 +3535,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);
|
|
|
|
@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
|
|
#endif
|
|
|
|
|
@@ -3501,6 +3540,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -3509,6 +3548,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
|
|
@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
@@ -3716,6 +3756,17 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
@@ -3724,6 +3764,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);
|
|
|
|
@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
net->ipv6.sysctl.flush_delay = 0;
|
|
|
|
|
@@ -3734,6 +3785,8 @@ out:
|
|
|
|
|
@@ -3742,6 +3793,8 @@ out:
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
out_ip6_prohibit_entry:
|
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
|
out_ip6_null_entry:
|
|
|
|
|
@@ -3751,6 +3804,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
@@ -3759,6 +3812,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);
|
|
|
|
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
#endif
|
|
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
|
|
}
|
|
|
|
|
@@ -3824,6 +3878,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
@@ -3832,6 +3886,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
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);
|
|
|
|
|