|
@@ -193,7 +193,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
case -EAGAIN:
|
|
|
rtm->rtm_type = RTN_THROW;
|
|
|
break;
|
|
|
-@@ -3362,6 +3399,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
+@@ -3363,6 +3400,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);
|
|
@@ -202,7 +202,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
|
|
|
-@@ -3578,6 +3617,17 @@ static int __net_init ip6_route_net_init
|
|
|
+@@ -3579,6 +3618,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);
|
|
@@ -220,7 +220,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
#endif
|
|
|
|
|
|
net->ipv6.sysctl.flush_delay = 0;
|
|
|
-@@ -3596,6 +3646,8 @@ out:
|
|
|
+@@ -3597,6 +3647,8 @@ out:
|
|
|
return ret;
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
@@ -229,7 +229,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
out_ip6_prohibit_entry:
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
out_ip6_null_entry:
|
|
|
-@@ -3613,6 +3665,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
+@@ -3614,6 +3666,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);
|
|
@@ -237,7 +237,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
|
|
|
#endif
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
}
|
|
|
-@@ -3710,6 +3763,9 @@ int __init ip6_route_init(void)
|
|
|
+@@ -3711,6 +3764,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);
|