|
@@ -364,17 +364,23 @@ static int vrf_rt6_create(struct net_device *dev)
|
|
|
{
|
|
|
struct net_vrf *vrf = netdev_priv(dev);
|
|
|
struct net *net = dev_net(dev);
|
|
|
+ struct fib6_table *rt6i_table;
|
|
|
struct rt6_info *rt6;
|
|
|
int rc = -ENOMEM;
|
|
|
|
|
|
+ rt6i_table = fib6_new_table(net, vrf->tb_id);
|
|
|
+ if (!rt6i_table)
|
|
|
+ goto out;
|
|
|
+
|
|
|
rt6 = ip6_dst_alloc(net, dev,
|
|
|
DST_HOST | DST_NOPOLICY | DST_NOXFRM | DST_NOCACHE);
|
|
|
if (!rt6)
|
|
|
goto out;
|
|
|
|
|
|
- rt6->dst.output = vrf_output6;
|
|
|
- rt6->rt6i_table = fib6_get_table(net, vrf->tb_id);
|
|
|
dst_hold(&rt6->dst);
|
|
|
+
|
|
|
+ rt6->rt6i_table = rt6i_table;
|
|
|
+ rt6->dst.output = vrf_output6;
|
|
|
vrf->rt6 = rt6;
|
|
|
rc = 0;
|
|
|
out:
|
|
@@ -462,6 +468,9 @@ static struct rtable *vrf_rtable_create(struct net_device *dev)
|
|
|
struct net_vrf *vrf = netdev_priv(dev);
|
|
|
struct rtable *rth;
|
|
|
|
|
|
+ if (!fib_new_table(dev_net(dev), vrf->tb_id))
|
|
|
+ return NULL;
|
|
|
+
|
|
|
rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1, 1, 0);
|
|
|
if (rth) {
|
|
|
rth->dst.output = vrf_output;
|