Fix debug statement in ospf_packet.c and merge error in ospf_lsa.c

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 0a48babc377f150f1d4949a6b2fe098b292b128e..9c8cd81ddcf79f0c39ed231171d6c3d945d6c9e0 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2620,8 +2620,6 @@ ospf_lsa_maxage_walker_remover (struct ospf_lsa *lsa, void *p_arg, int int_arg)
           case OSPF_OPAQUE_LINK_LSA:
           case OSPF_OPAQUE_AREA_LSA:
           case OSPF_OPAQUE_AS_LSA:
-          case OSPF_OPAQUE_LINK_LSA:
-          case OSPF_OPAQUE_AREA_LSA:
             /*
              * As a general rule, whenever network topology has changed
              * (due to an LSA removal in this case), routing recalculation

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 0b9e60f368c297d7d1ebf09037e14fce5ccb5d93..d8456842eec9725f9e9b4cac89c99b17747e960a 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2217,7 +2217,7 @@ ospf_read (struct thread *thread)
   top->t_read = thread_add_read (master, ospf_read, top, top->fd);
 
   /* IP Header dump. */
-    if (ospf_debug_packet & OSPF_DEBUG_RECV)
+    if (IS_DEBUG_OSPF_PACKET(0, RECV))
            ospf_ip_header_dump (ibuf);
 
   /* Self-originated packet should be discarded silently. */