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, 7 insertions, 7 deletions

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index eb21e6e68..6a0d01a07 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -374,7 +374,7 @@ static int
 rtadv_timer (struct thread *thread)
 {
   struct zebra_ns *zns = THREAD_ARG (thread);
-  vrf_iter_t iter;
+  struct vrf *vrf;
   struct listnode *node, *nnode;
   struct interface *ifp;
   struct zebra_if *zif;
@@ -392,8 +392,8 @@ rtadv_timer (struct thread *thread)
       rtadv_event (zns, RTADV_TIMER_MSEC, 10 /* 10 ms */);
     }
 
-  for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter))
-    for (ALL_LIST_ELEMENTS (vrf_iter2iflist (iter), node, nnode, ifp))
+  RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id)
+    for (ALL_LIST_ELEMENTS (vrf->iflist, node, nnode, ifp))
       {
         if (if_is_loopback (ifp) ||
             CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK) ||
@@ -827,7 +827,7 @@ zebra_interface_radv_set (struct zserv *client, int sock, u_short length,
 
   if (IS_ZEBRA_DEBUG_EVENT)
     zlog_debug("%u: IF %u RA %s from client %s, interval %ds",
-               zvrf->vrf_id, ifindex, enable ? "enable" : "disable",
+               zvrf_id (zvrf), ifindex, enable ? "enable" : "disable",
                zebra_route_string(client->proto), ra_interval);
 
   /* Locate interface and check VRF match. */
@@ -835,14 +835,14 @@ zebra_interface_radv_set (struct zserv *client, int sock, u_short length,
   if (!ifp)
     {
       zlog_warn("%u: IF %u RA %s client %s - interface unknown",
-               zvrf->vrf_id, ifindex, enable ? "enable" : "disable",
+               zvrf_id (zvrf), ifindex, enable ? "enable" : "disable",
                zebra_route_string(client->proto));
       return;
     }
-  if (ifp->vrf_id != zvrf->vrf_id)
+  if (ifp->vrf_id != zvrf_id (zvrf))
     {
       zlog_warn("%u: IF %u RA %s client %s - VRF mismatch, IF VRF %u",
-               zvrf->vrf_id, ifindex, enable ? "enable" : "disable",
+               zvrf_id (zvrf), ifindex, enable ? "enable" : "disable",
                zebra_route_string(client->proto), ifp->vrf_id);
       return;
     }