Merge pull request #3325 from adeg/bugfix/bgpd-vtysh-fixes

[mirror_frr.git] / isisd / isis_route.c

diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index b1225ae5474c90389539d442a3454cb407bc347d..1439a4229a1aec7591dba49bad4d96e30132825e 100644 (file)
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -253,13 +253,13 @@ static void isis_route_info_delete(struct isis_route_info *route_info)
        if (route_info->nexthops) {
                route_info->nexthops->del =
                        (void (*)(void *))isis_nexthop_delete;
-               list_delete_and_null(&route_info->nexthops);
+               list_delete(&route_info->nexthops);
        }
 
        if (route_info->nexthops6) {
                route_info->nexthops6->del =
                        (void (*)(void *))isis_nexthop6_delete;
-               list_delete_and_null(&route_info->nexthops6);
+               list_delete(&route_info->nexthops6);
        }
 
        XFREE(MTYPE_ISIS_ROUTE_INFO, route_info);
@@ -492,7 +492,7 @@ static void _isis_route_verify_table(struct isis_area *area,
 
 void isis_route_verify_table(struct isis_area *area, struct route_table *table)
 {
-       return _isis_route_verify_table(area, table, NULL);
+       _isis_route_verify_table(area, table, NULL);
 }
 
 /* Function to validate route tables for L1L2 areas. In this case we can't use