Merge pull request #1667 from Orange-OpenSource/master

OSPFD: Solve Issue #1652
FRRouting · Jan 24, 2018 · c7cbd53 · c7cbd53
2 parents d6fed38 + 139a482
commit c7cbd53
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
@@ -589,30 +589,6 @@ static void free_opaque_info_per_type(void *val)
 		ospf_opaque_lsa_flush_schedule(lsa);
 	}
 
-	/* Remove "oipt" from its owner's self-originated LSA list. */
-	switch (oipt->lsa_type) {
-	case OSPF_OPAQUE_LINK_LSA: {
-		struct ospf_interface *oi =
-			(struct ospf_interface *)(oipt->owner);
-		listnode_delete(oi->opaque_lsa_self, oipt);
-		break;
-	}
-	case OSPF_OPAQUE_AREA_LSA: {
-		struct ospf_area *area = (struct ospf_area *)(oipt->owner);
-		listnode_delete(area->opaque_lsa_self, oipt);
-		break;
-	}
-	case OSPF_OPAQUE_AS_LSA: {
-		struct ospf *top = (struct ospf *)(oipt->owner);
-		listnode_delete(top->opaque_lsa_self, oipt);
-		break;
-	}
-	default:
-		zlog_warn("free_opaque_info_per_type: Unexpected LSA-type(%u)",
-			  oipt->lsa_type);
-		break; /* This case may not exist. */
-	}
-
 	OSPF_TIMER_OFF(oipt->t_opaque_lsa_self);
 	list_delete_and_null(&oipt->id_list);
 	XFREE(MTYPE_OPAQUE_INFO_PER_TYPE, oipt);

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
@@ -844,7 +844,6 @@ static void ospf_area_free(struct ospf_area *area)
 	LSDB_LOOP(OPAQUE_LINK_LSDB(area), rn, lsa)
 		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 
-	ospf_opaque_type10_lsa_term(area);
 	ospf_lsdb_delete_all(area->lsdb);
 	ospf_lsdb_free(area->lsdb);