Merge remote-tracking branch 'osr/master' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/command_match.c

1 files changed, 2 insertions, 2 deletions

diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c
index 7dc6cbaaa4..e6ae9c71d4 100644
--- a/zebra/zebra_static.c
+++ b/zebra/zebra_static.c
@@ -130,7 +130,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, struct static_ro
       rib->metric = 0;
       rib->mtu = 0;
       rib->vrf_id = si->vrf_id;
-      rib->table =  si->vrf_id ? (zebra_vrf_lookup(si->vrf_id))->table_id : zebrad.rtm_table_default;
+      rib->table =  si->vrf_id ? (zebra_vrf_lookup_by_id(si->vrf_id))->table_id : zebrad.rtm_table_default;
       rib->nexthop_num = 0;
       rib->tag = si->tag;
 
@@ -423,7 +423,7 @@ static_add_route (afi_t afi, safi_t safi, u_char type, struct prefix *p,
   si->distance = distance;
   si->flags = flags;
   si->tag = tag;
-  si->vrf_id = zvrf->vrf_id;
+  si->vrf_id = zvrf_id (zvrf);
   si->ifindex = ifindex;
   if (si->ifindex)
     strcpy(si->ifname, ifname);