zebra: prefer DEFINE_MTYPE_STATIC for local memtypes

Signed-off-by: Lars Seipel <ls@slrz.net>

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index 33225c97c6adf2f9e83783e3316bc8a0fb46b66d..5b95a6977ed7b14bed9993f67705926bc397b545 100644 (file)
--- 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 4eaabd237d9c711230a432151bab5eacee12d224..ee041b1c3dbd95009cb1a79b9a80083aaae9875c 100644 (file)
--- 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 1f3015186f5bb9c3b69fcc5603a4d666da0dc5d0..de55478de2fc841d59b810063e0a83d8f31de1d4 100644 (file)
--- 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)