diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/memtypes.c | 3 | ||||
| -rw-r--r-- | lib/nexthop.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/memtypes.c b/lib/memtypes.c index fc50443600..828820f309 100644 --- a/lib/memtypes.c +++ b/lib/memtypes.c @@ -85,8 +85,7 @@ struct memory_list memory_list_zebra[] = { MTYPE_NEXTHOP, "Nexthop" }, { MTYPE_RIB, "RIB" }, { MTYPE_RIB_QUEUE, "RIB process work queue" }, - { MTYPE_STATIC_IPV4, "Static IPv4 route" }, - { MTYPE_STATIC_IPV6, "Static IPv6 route" }, + { MTYPE_STATIC_ROUTE, "Static route" }, { MTYPE_RIB_DEST, "RIB destination" }, { MTYPE_RIB_TABLE_INFO, "RIB table info" }, { MTYPE_RNH, "Nexthop tracking object" }, diff --git a/lib/nexthop.h b/lib/nexthop.h index e92d97262c..6909775a06 100644 --- a/lib/nexthop.h +++ b/lib/nexthop.h @@ -27,9 +27,7 @@ union g_addr { struct in_addr ipv4; -#ifdef HAVE_IPV6 struct in6_addr ipv6; -#endif /* HAVE_IPV6 */ }; enum nexthop_types_t |