diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 15:40:57 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 19:34:06 +0200 |
| commit | 3c3c325203848994bae83a85cb606d4e4deeeb25 (patch) | |
| tree | ac8447eb389883d0f009599cb4ea460401f5af8b /ripd/rip_interface.c | |
| parent | *: Convert interface_down to interface down callback (diff) | |
| download | frr-3c3c325203848994bae83a85cb606d4e4deeeb25.tar.xz frr-3c3c325203848994bae83a85cb606d4e4deeeb25.zip | |
*: Convert zapi->interface_delete to ifp callback
Convert the callback of the interface_delete to the new
ifp callback.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 13b9b874e..3173277ba 100644 --- 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) { |