Merge pull request #5305 from ton31337/feature/draft-ietf-idr-deprecate-as-set-confed-set

[mirror_frr.git] / ospfd / ospf_packet.c

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8634589b11c3c5e0b1320d1b8134c80a6024b312..80ffc3f36102e40e7d83bd70d415cc47a6dd9b07 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -3746,8 +3746,6 @@ int ospf_hello_reply_timer(struct thread *thread)
        nbr = THREAD_ARG(thread);
        nbr->t_hello_reply = NULL;
 
-       assert(nbr->oi);
-
        if (IS_DEBUG_OSPF(nsm, NSM_TIMERS))
                zlog_debug("NSM[%s:%s]: Timer (hello-reply timer expire)",
                           IF_NAME(nbr->oi), inet_ntoa(nbr->router_id));
@@ -4335,7 +4333,7 @@ void ospf_proactively_arp(struct ospf_neighbor *nbr)
        char ping_nbr[OSPF_PING_NBR_STR_MAX];
        int ret;
 
-       if (!nbr || !nbr->oi || !nbr->oi->ifp)
+       if (!nbr)
                return;
 
        snprintf(ping_nbr, sizeof(ping_nbr),