diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 09:40:57 -0400 | 
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 13:34:06 -0400 | 
| commit | 3c3c325203848994bae83a85cb606d4e4deeeb25 (patch) | |
| tree | ac8447eb389883d0f009599cb4ea460401f5af8b /staticd/static_zebra.c | |
| parent | b0b69e59f463b696d0e20f30c46c59c9cf0044b1 (diff) | |
*: 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 'staticd/static_zebra.c')
| -rw-r--r-- | staticd/static_zebra.c | 21 | 
1 files changed, 1 insertions, 20 deletions
diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index c494cf6cce..b364dd6290 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -57,21 +57,8 @@ static int static_ifp_create(struct interface *ifp)  	return 0;  } -static int interface_delete(ZAPI_CALLBACK_ARGS) +static int static_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; - -	if_set_index(ifp, IFINDEX_INTERNAL); -  	static_ifindex_update(ifp, false);  	return 0;  } @@ -476,11 +463,6 @@ extern void static_zebra_route_add(struct route_node *rn,  			   zclient, &api);  } -static int static_ifp_destroy(struct interface *ifp) -{ -	return 0; -} -  void static_zebra_init(void)  {  	struct zclient_options opt = { .receive_notify = true }; @@ -493,7 +475,6 @@ void static_zebra_init(void)  	zclient_init(zclient, ZEBRA_ROUTE_STATIC, 0, &static_privs);  	zclient->zebra_capabilities = static_zebra_capabilities;  	zclient->zebra_connected = zebra_connected; -	zclient->interface_delete = interface_delete;  	zclient->interface_address_add = interface_address_add;  	zclient->interface_address_delete = interface_address_delete;  	zclient->route_notify_owner = route_notify_owner;  | 
