summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Jakma <paul@jakma.org>2015-10-20 13:47:09 +0100
committerPaul Jakma <paul@quagga.net>2015-10-27 10:59:52 +0000
commit13862bfc779f6f63080c8d860f7b919b27f39b9c (patch)
treeb16fe03a4d8fd91a0d1de9afdf1232deacff299d
parent8a667cf7c58a065bcd6371f4ad6f25bfb084181c (diff)
downloadquagga-13862bfc779f6f63080c8d860f7b919b27f39b9c.tar.bz2
quagga-13862bfc779f6f63080c8d860f7b919b27f39b9c.tar.xz
Revert "Fix to take care of ordering between interface and router ospf command."
This reverts commit 4bab6806914dbb4b43f376ebf966a034a0ea72cd, as Joakim's version of 'ip ospf area' and the 2 follow-up patches should avoid the issue Vipin reported. Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--ospfd/ospf_main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 10565fe6..1e4184ff 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -312,15 +312,6 @@ main (int argc, char **argv)
ospf_opaque_init ();
#endif /* HAVE_OPAQUE_LSA */
- /* Need to initialize the default ospf structure, so the interface mode
- commands can be duly processed if they are received before 'router ospf',
- when quagga(ospfd) is restarted */
- if (!ospf_get())
- {
- zlog_err("OSPF instance init failed: %s", strerror(errno));
- exit (1);
- }
-
/* Get configuration file. */
vty_read_config (config_file, config_default);