From 17b78d38e438bb25d27aa00554ad948a792850aa Mon Sep 17 00:00:00 2001
From: paul <paul>
Date: Thu, 13 Feb 2003 22:04:01 +0000
Subject: Fix debug statement in ospf_packet.c and merge error in ospf_lsa.c

---
 ospfd/ospf_lsa.c    | 2 --
 ospfd/ospf_packet.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'ospfd')

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 0a48babc..9c8cd81d 100644
--- 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 0b9e60f3..d8456842 100644
--- 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. */
-- 
cgit v1.2.1