1 files changed, 9 insertions, 9 deletions

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index c4c4d2f03..359d59cb5 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -525,7 +525,7 @@ int ospf_ls_upd_timer(struct thread *thread)
 		if (listcount(update) > 0)
 			ospf_ls_upd_send(nbr, update, OSPF_SEND_PACKET_DIRECT,
 					 0);
-		list_delete_and_null(&update);
+		list_delete(&update);
 	}
 
 	/* Set LS Update retransmission timer. */
@@ -1620,7 +1620,7 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
 		/* Verify LSA type. */
 		if (ls_type < OSPF_MIN_LSA || ls_type >= OSPF_MAX_LSA) {
 			OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq);
-			list_delete_and_null(&ls_upd);
+			list_delete(&ls_upd);
 			return;
 		}
 
@@ -1629,7 +1629,7 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
 				       adv_router);
 		if (find == NULL) {
 			OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq);
-			list_delete_and_null(&ls_upd);
+			list_delete(&ls_upd);
 			return;
 		}
 
@@ -1664,9 +1664,9 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
 			ospf_ls_upd_send(nbr, ls_upd, OSPF_SEND_PACKET_INDIRECT,
 					 0);
 
-		list_delete_and_null(&ls_upd);
+		list_delete(&ls_upd);
 	} else
-		list_delete_and_null(&ls_upd);
+		list_delete(&ls_upd);
 }
 
 /* Get the list of LSAs from Link State Update packet.
@@ -1811,7 +1811,7 @@ static void ospf_upd_list_clean(struct list *lsas)
 	for (ALL_LIST_ELEMENTS(lsas, node, nnode, lsa))
 		ospf_lsa_discard(lsa);
 
-	list_delete_and_null(&lsas);
+	list_delete(&lsas);
 }
 
 /* OSPF Link State Update message read -- RFC2328 Section 13. */
@@ -2215,7 +2215,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 #undef DISCARD_LSA
 
 	assert(listcount(lsas) == 0);
-	list_delete_and_null(&lsas);
+	list_delete(&lsas);
 }
 
 /* OSPF Link State Acknowledgment message read -- RFC2328 Section 13.7. */
@@ -3855,7 +3855,7 @@ void ospf_ls_upd_send_lsa(struct ospf_neighbor *nbr, struct ospf_lsa *lsa,
 	else
 		ospf_ls_upd_send(nbr, update, flag, 0);
 
-	list_delete_and_null(&update);
+	list_delete(&update);
 }
 
 /* Determine size for packet. Must be at least big enough to accomodate next
@@ -4016,7 +4016,7 @@ static int ospf_ls_upd_send_queue_event(struct thread *thread)
 
 		/* list might not be empty. */
 		if (listcount(update) == 0) {
-			list_delete_and_null((struct list **)&rn->info);
+			list_delete((struct list **)&rn->info);
 			route_unlock_node(rn);
 		} else
 			again = 1;