*: change interface structure, from vrf_id to vrf

[mirror_frr.git] / ripngd / ripng_interface.c

diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index ebecb6484720e4c73a8939a8dea2bca94e303060..71f5552b2ab6d592e87f091074654f94477794de 100644 (file)
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -210,7 +210,7 @@ int ripng_interface_up(ZAPI_CALLBACK_ARGS)
        if (IS_RIPNG_DEBUG_ZEBRA)
                zlog_debug(
                        "interface up %s vrf %u index %d flags %llx metric %d mtu %d",
-                       ifp->name, ifp->vrf_id, ifp->ifindex,
+                       ifp->name, ifp->vrf->vrf_id, ifp->ifindex,
                        (unsigned long long)ifp->flags, ifp->metric, ifp->mtu6);
 
        ripng_interface_sync(ifp);
@@ -247,7 +247,7 @@ int ripng_interface_down(ZAPI_CALLBACK_ARGS)
        if (IS_RIPNG_DEBUG_ZEBRA)
                zlog_debug(
                        "interface down %s vrf %u index %d flags %#llx metric %d mtu %d",
-                       ifp->name, ifp->vrf_id, ifp->ifindex,
+                       ifp->name, ifp->vrf->vrf_id, ifp->ifindex,
                        (unsigned long long)ifp->flags, ifp->metric, ifp->mtu6);
 
        return 0;
@@ -264,7 +264,7 @@ int ripng_interface_add(ZAPI_CALLBACK_ARGS)
        if (IS_RIPNG_DEBUG_ZEBRA)
                zlog_debug(
                        "RIPng interface add %s vrf %u index %d flags %#llx metric %d mtu %d",
-                       ifp->name, ifp->vrf_id, ifp->ifindex,
+                       ifp->name, ifp->vrf->vrf_id, ifp->ifindex,
                        (unsigned long long)ifp->flags, ifp->metric, ifp->mtu6);
 
        /* Check is this interface is RIP enabled or not.*/
@@ -299,7 +299,7 @@ int ripng_interface_delete(ZAPI_CALLBACK_ARGS)
 
        zlog_info(
                "interface delete %s vrf %u index %d flags %#llx metric %d mtu %d",
-               ifp->name, ifp->vrf_id, ifp->ifindex,
+               ifp->name, ifp->vrf->vrf_id, ifp->ifindex,
                (unsigned long long)ifp->flags, ifp->metric, ifp->mtu6);
 
        /* To support pseudo interface do not free interface structure.  */
@@ -328,6 +328,7 @@ int ripng_interface_vrf_update(ZAPI_CALLBACK_ARGS)
                           ifp->name, vrf_id, new_vrf_id);
 
        if_update_to_new_vrf(ifp, new_vrf);
+
        ripng_interface_sync(ifp);
 
        return 0;
@@ -932,7 +933,7 @@ void ripng_interface_sync(struct interface *ifp)
 {
        struct vrf *vrf;
 
-       vrf = vrf_lookup_by_id(ifp->vrf_id);
+       vrf = ifp->vrf;
        if (vrf) {
                struct ripng_interface *ri;