diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-25 21:38:04 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-25 21:38:04 +0200 |
| commit | e9e190f2452653469f652a04ef34294430787497 (patch) | |
| tree | c4252c4a401f7a3dedf55d29e08c76f375003057 /lib/routemap.c | |
| parent | bgpd: Fixup / add back some BGP show commands (diff) | |
| parent | zebra: If fpm is not turned on hide the cli for it (diff) | |
| download | frr-e9e190f2452653469f652a04ef34294430787497.tar.xz frr-e9e190f2452653469f652a04ef34294430787497.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Conflicts:
vtysh/vtysh.c
zebra/zebra_vty.c
Diffstat (limited to 'lib/routemap.c')
| -rw-r--r-- | lib/routemap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/routemap.c b/lib/routemap.c index a4a8a2bb2..dc89390a9 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -2932,7 +2932,11 @@ route_map_finish (void) /* cleanup route_map */ while (route_map_master.head) - route_map_delete (route_map_master.head); + { + struct route_map *map = route_map_master.head; + map->to_be_processed = 0; + route_map_delete (map); + } for (i = 1; i < ROUTE_MAP_DEP_MAX; i++) hash_free(route_map_dep_hash[i]); |