From 110765e34ae7137edd5324408507d3722fbac229 Mon Sep 17 00:00:00 2001 From: Lars Seipel Date: Mon, 11 Feb 2019 02:10:50 +0100 Subject: [PATCH] zebra: prefer DEFINE_MTYPE_STATIC for local memtypes Signed-off-by: Lars Seipel --- zebra/rtadv.c | 3 +++ zebra/zebra_memory.c | 2 -- zebra/zebra_memory.h | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 33225c97c6..5b95a6977e 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -66,6 +66,9 @@ extern struct zebra_privs_t zserv_privs; #define ALLNODE "ff02::1" #define ALLROUTER "ff02::2" +DEFINE_MTYPE_STATIC(ZEBRA, RTADV_RDNSS, "Router Advertisement RDNSS") +DEFINE_MTYPE_STATIC(ZEBRA, RTADV_DNSSL, "Router Advertisement DNSSL") + /* Order is intentional. Matches RFC4191. This array is also used for command matching, so only modify with care. */ const char *rtadv_pref_strs[] = {"medium", "high", "INVALID", "low", 0}; diff --git a/zebra/zebra_memory.c b/zebra/zebra_memory.c index 4eaabd237d..ee041b1c3d 100644 --- a/zebra/zebra_memory.c +++ b/zebra/zebra_memory.c @@ -27,8 +27,6 @@ DEFINE_MGROUP(ZEBRA, "zebra") DEFINE_MTYPE(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix") -DEFINE_MTYPE(ZEBRA, RTADV_RDNSS, "Router Advertisement RDNSS") -DEFINE_MTYPE(ZEBRA, RTADV_DNSSL, "Router Advertisement DNSSL") DEFINE_MTYPE(ZEBRA, ZEBRA_VRF, "ZEBRA VRF") DEFINE_MTYPE(ZEBRA, RE, "Route Entry") DEFINE_MTYPE(ZEBRA, RIB_QUEUE, "RIB process work queue") diff --git a/zebra/zebra_memory.h b/zebra/zebra_memory.h index 1f3015186f..de55478de2 100644 --- a/zebra/zebra_memory.h +++ b/zebra/zebra_memory.h @@ -26,8 +26,6 @@ DECLARE_MGROUP(ZEBRA) DECLARE_MTYPE(RTADV_PREFIX) -DECLARE_MTYPE(RTADV_RDNSS) -DECLARE_MTYPE(RTADV_DNSSL) DECLARE_MTYPE(ZEBRA_NS) DECLARE_MTYPE(ZEBRA_VRF) DECLARE_MTYPE(RE) -- 2.39.5