diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /lib/module.c | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'lib/module.c')
| -rw-r--r-- | lib/module.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/module.c b/lib/module.c index b3ab91c4ea..3f13307d82 100644 --- a/lib/module.c +++ b/lib/module.c @@ -42,10 +42,11 @@ static struct frrmod_info frrmod_default_info = { .description = "libfrr core module", }; union _frrmod_runtime_u frrmod_default = { - .r = { - .info = &frrmod_default_info, - .finished_loading = 1, - }, + .r = + { + .info = &frrmod_default_info, + .finished_loading = 1, + }, }; // if defined(HAVE_SYS_WEAK_ALIAS_ATTRIBUTE) |