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_lsdb.c b/ospf6d/ospf6_lsdb.c
index 9b37406..247238b 100644
--- a/ospf6d/ospf6_lsdb.c
+++ b/ospf6d/ospf6_lsdb.c
@@ -83,15 +83,14 @@
if (num == lsdb->count)
return;
- if (IS_OSPF6_DEBUG_LSA (DATABASE))
- {
- zlog_info ("PANIC !! lsdb[%p]->count = %d, real = %d",
- lsdb, lsdb->count, num);
- for (debug = ospf6_lsdb_head (lsdb); debug;
- debug = ospf6_lsdb_next (debug))
- zlog_info ("%p %p %s", debug->prev, debug->next, debug->name);
- zlog_info ("DUMP END");
- }
+ zlog_info ("PANIC !! lsdb[%p]->count = %d, real = %d",
+ lsdb, lsdb->count, num);
+ for (debug = ospf6_lsdb_head (lsdb); debug;
+ debug = ospf6_lsdb_next (debug))
+ zlog_info ("%p %p %s lsdb[%p]", debug->prev, debug->next, debug->name,
+ debug->lsdb);
+ zlog_info ("DUMP END");
+
assert (num == lsdb->count);
}
#define ospf6_lsdb_count_assert(t) (_lsdb_count_assert (t))