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 /ospf6d/ospf6_main.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 'ospf6d/ospf6_main.c')
| -rw-r--r-- | ospf6d/ospf6_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 88f03d8f64..9580d87cf0 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -202,6 +202,9 @@ int main(int argc, char *argv[], char *envp[]) exit(1); } + /* OSPF6 master init. */ + ospf6_master_init(); + /* thread master */ master = frr_init(); |