Merge pull request #5197 from SumitAgarwal123/BFD_ADMIN_DOWN

[mirror_frr.git] / ripd / rip_interface.c

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 13b9b874e3808f17da6d5f0939ad961436936b4c..3173277ba7553fd449a90b91ea24fa6db090a781 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -411,19 +411,8 @@ static int rip_ifp_create(struct interface *ifp)
        return 0;
 }
 
-int rip_interface_delete(ZAPI_CALLBACK_ARGS)
+static int rip_ifp_destroy(struct interface *ifp)
 {
-       struct interface *ifp;
-       struct stream *s;
-
-
-       s = zclient->ibuf;
-       /* zebra_interface_state_read() updates interface structure in iflist */
-       ifp = zebra_interface_state_read(s, vrf_id);
-
-       if (ifp == NULL)
-               return 0;
-
        rip_interface_sync(ifp);
        if (if_is_up(ifp)) {
                rip_if_down(ifp);
@@ -434,10 +423,6 @@ int rip_interface_delete(ZAPI_CALLBACK_ARGS)
                ifp->name, ifp->vrf_id, ifp->ifindex,
                (unsigned long long)ifp->flags, ifp->metric, ifp->mtu);
 
-       /* To support pseudo interface do not free interface structure.  */
-       /* if_delete(ifp); */
-       if_set_index(ifp, IFINDEX_INTERNAL);
-
        return 0;
 }
 
@@ -1229,11 +1214,6 @@ static int rip_interface_delete_hook(struct interface *ifp)
        return 0;
 }
 
-static int rip_ifp_destroy(struct interface *ifp)
-{
-       return 0;
-}
-
 /* Allocate and initialize interface vector. */
 void rip_if_init(void)
 {