|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
-@@ -6287,6 +6318,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
+@@ -6280,6 +6311,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 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
#endif
|
|
|
-@@ -6298,6 +6331,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
+@@ -6291,6 +6324,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
#endif
|
|
|
}
|
|
|
-@@ -6489,6 +6523,8 @@ static int __net_init ip6_route_net_init
|
|
|
+@@ -6482,6 +6516,8 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
net->ipv6.fib6_has_custom_rules = false;
|
|
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
|
|
sizeof(*net->ipv6.ip6_prohibit_entry),
|
|
|
GFP_KERNEL);
|
|
|
-@@ -6499,11 +6535,21 @@ static int __net_init ip6_route_net_init
|
|
|
+@@ -6492,11 +6528,21 @@ static int __net_init ip6_route_net_init
|
|
|
ip6_template_metrics, true);
|
|
|
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
|
|
|
|
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
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);
|
|
|
-@@ -6530,6 +6576,8 @@ out:
|
|
|
+@@ -6523,6 +6569,8 @@ out:
|
|
|
return ret;
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
out_ip6_prohibit_entry:
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
out_ip6_null_entry:
|
|
|
-@@ -6549,6 +6597,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
+@@ -6542,6 +6590,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
kfree(net->ipv6.ip6_null_entry);
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
#endif
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
-@@ -6632,6 +6681,9 @@ void __init ip6_route_init_special_entri
|
|
|
+@@ -6625,6 +6674,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);
|