Merge svn revisions 924 and 925 from Zebra CVS. Also remove useless
ospf6_lsdb prototype declaration from ospf6_lsa.h. Report sent to Yasuhiro
Ohara as well.
diff --git a/ospf6d/ospf6_spf.h b/ospf6d/ospf6_spf.h
index 1c04afb..64f5ed8 100644
--- a/ospf6d/ospf6_spf.h
+++ b/ospf6d/ospf6_spf.h
@@ -24,8 +24,8 @@
/* Debug option */
extern unsigned char conf_debug_ospf6_spf;
-#define OSPF6_DEBUG_SPF_SUMMARY 0x01
-#define OSPF6_DEBUG_SPF_DETAIL 0x02
+#define OSPF6_DEBUG_SPF_PROCESS 0x01
+#define OSPF6_DEBUG_SPF_TIME 0x02
#define OSPF6_DEBUG_SPF_ON(level) \
(conf_debug_ospf6_spf |= (level))
#define OSPF6_DEBUG_SPF_OFF(level) \