Merge pull request #5706 from mjstapp/fix_nh_debug_show

[mirror_frr.git] / ospf6d / ospf6_flood.c

diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 2059d8486829c099daf136c1b853df2d8e418fc0..15dbd0716a2c528683de2d8c68f00b00bc437c0f 100644 (file)
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -330,6 +330,8 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa,
                                                zlog_debug(
                                                        "Requesting the same, remove it, next neighbor");
                                        if (req == on->last_ls_req) {
+                                               /* sanity check refcount */
+                                               assert(req->lock >= 2);
                                                ospf6_lsa_unlock(req);
                                                on->last_ls_req = NULL;
                                        }
@@ -840,18 +842,6 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from,
                                zlog_debug("Received is duplicated LSA");
                        SET_FLAG(new->flag, OSPF6_LSA_DUPLICATE);
                }
-               if (old->header->adv_router
-                           == from->ospf6_if->area->ospf6->router_id
-                   && OSPF6_LSA_IS_MAXAGE(new)) {
-                       ospf6_acknowledge_lsa(new, ismore_recent, from);
-                       ospf6_lsa_delete(new);
-                       if (is_debug)
-                               zlog_debug(
-                                       "%s: Received is self orig MAXAGE LSA %s, discard (ismore_recent %d)",
-                                       __PRETTY_FUNCTION__, old->name,
-                                       ismore_recent);
-                       return;
-               }
        }
 
        /* if no database copy or received is more recent */