diff options
| author | Russ White <russ@riw.us> | 2021-03-23 10:07:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 10:07:28 -0400 |
| commit | 63d4a9708cad8dadd9ba0f1b104072862fc41c98 (patch) | |
| tree | ec77133952bdb98e76fc15249dd2ca3eb63b848e /zebra/zebra_router.c | |
| parent | 38981e4bbae90aa854b3c7487075e4a69c55ddc5 (diff) | |
| parent | 224ccf29d9e9d08a6a177d8c994ab5a743b276cf (diff) | |
Merge pull request #8307 from opensourcerouting/mtypes-cleanup-20210322
isisd, eigrpd, pathd: clean up & drop *_memory.[ch] files, make a whole bunch static
Diffstat (limited to 'zebra/zebra_router.c')
| -rw-r--r-- | zebra/zebra_router.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c index 11c1130c4f..5a00f3155d 100644 --- a/zebra/zebra_router.c +++ b/zebra/zebra_router.c @@ -25,7 +25,6 @@ #include "lib/frratomic.h" #include "zebra_router.h" -#include "zebra_memory.h" #include "zebra_pbr.h" #include "zebra_vxlan.h" #include "zebra_mlag.h" @@ -33,6 +32,7 @@ #include "debug.h" DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info"); +DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_RT_TABLE, "Zebra VRF table"); struct zebra_router zrouter = { .multipath_num = MULTIPATH_NUM, @@ -121,7 +121,7 @@ struct route_table *zebra_router_get_table(struct zebra_vrf *zvrf, if (zrt) return zrt->table; - zrt = XCALLOC(MTYPE_ZEBRA_NS, sizeof(*zrt)); + zrt = XCALLOC(MTYPE_ZEBRA_RT_TABLE, sizeof(*zrt)); zrt->tableid = tableid; zrt->afi = afi; zrt->safi = safi; @@ -185,7 +185,7 @@ static void zebra_router_free_table(struct zebra_router_table *zrt) RB_REMOVE(zebra_router_table_head, &zrouter.tables, zrt); XFREE(MTYPE_RIB_TABLE_INFO, table_info); - XFREE(MTYPE_ZEBRA_NS, zrt); + XFREE(MTYPE_ZEBRA_RT_TABLE, zrt); } void zebra_router_release_table(struct zebra_vrf *zvrf, uint32_t tableid, |