diff options
author | David Ahern <dsa@cumulusnetworks.com> | 2016-05-04 21:46:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-06 15:51:47 -0400 |
commit | b3b4663c973bf11ef19243fa4f1a544cbdc2fa8e (patch) | |
tree | 6732d3a50a98f9009e8eea89c362cd4ea49441f0 /drivers/net/vrf.c | |
parent | f37bd0cced37189fc5dd34a85c90710700fd38d5 (diff) | |
download | linux-b3b4663c973bf11ef19243fa4f1a544cbdc2fa8e.tar.bz2 |
net: vrf: Create FIB tables on link create
Tables have to exist for VRFs to function. Ensure they exist
when VRF device is created.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vrf.c')
-rw-r--r-- | drivers/net/vrf.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 8a8f1e58b415..4b2461ae5d3b 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -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; |