Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
	bgpd/bgp_evpn.c

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/memory.c b/lib/memory.c
index c684c7605c..90d7d420a9 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -132,7 +132,7 @@ static int qmem_exit_walker(void *arg, struct memgroup *mg, struct memtype *mt)
 
 int log_memstats(FILE *fp, const char *prefix)
 {
-	struct exit_dump_args eda = { .fp = fp, .prefix = prefix, .error = 0 };
+	struct exit_dump_args eda = {.fp = fp, .prefix = prefix, .error = 0};
 	qmem_walk(qmem_exit_walker, &eda);
 	return eda.error;
 }