zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / ospfd / ospf_flood.c

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 7ad9cf9f2f1c224c372391ae79e5f2263d1666ab..714c47b4e67c5d7ac511f4ea4242e40df1433710 100644 (file)
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -218,7 +218,7 @@ static void ospf_process_self_originated_lsa(struct ospf *ospf,
                break;
        case OSPF_OPAQUE_AS_LSA:
                ospf_opaque_lsa_refresh(new);
-                       /* Reconsideration may needed. */ /* XXX */
+               /* Reconsideration may needed. */ /* XXX */
                break;
        default:
                break;
@@ -319,7 +319,7 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
 
        /* Do some internal house keeping that is needed here */
        SET_FLAG(new->flags, OSPF_LSA_RECEIVED);
-       ospf_lsa_is_self_originated(ospf, new); /* Let it set the flag */
+       (void)ospf_lsa_is_self_originated(ospf, new); /* Let it set the flag */
 
        /* Install the new LSA in the link state database
           (replacing the current database copy).  This may cause the
@@ -539,7 +539,6 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
            IP addresses for these packets are the neighbors' IP
            addresses.   */
        if (oi->type == OSPF_IFTYPE_NBMA) {
-               struct route_node *rn;
                struct ospf_neighbor *nbr;
 
                for (rn = route_top(oi->nbrs); rn; rn = route_next(rn))
@@ -810,8 +809,7 @@ struct ospf_lsa *ospf_ls_request_new(struct lsa_header *lsah)
 {
        struct ospf_lsa *new;
 
-       new = ospf_lsa_new();
-       new->data = ospf_lsa_data_new(OSPF_LSA_HEADER_SIZE);
+       new = ospf_lsa_new_and_data(OSPF_LSA_HEADER_SIZE);
        memcpy(new->data, lsah, OSPF_LSA_HEADER_SIZE);
 
        return new;