ospfd: remove LSA reorigin on NSM change

This is a "workaround" for something broken in LSDB sync that has been
kept around since the beginning of our git history...

(It works correctly without this "workaround".)

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index f7c73fee3397914b2d4ed7b19eef86e2f64a3b1d..ee27ec094260ec9575044558cb1396b3a244a286 100644 (file)
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -616,8 +616,6 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state)
        struct ospf_interface *oi = nbr->oi;
        struct ospf_area *vl_area = NULL;
        uint8_t old_state;
-       int x;
-       int force = 1;
 
        /* Preserve old status. */
        old_state = nbr->state;
@@ -664,32 +662,6 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state)
                        if (oi->type == OSPF_IFTYPE_VIRTUALLINK && vl_area)
                                if (++vl_area->full_vls == 1)
                                        ospf_schedule_abr_task(oi->ospf);
-
-                       /* kevinm: refresh any redistributions */
-                       for (x = ZEBRA_ROUTE_SYSTEM; x < ZEBRA_ROUTE_MAX; x++) {
-                               struct list *red_list;
-                               struct listnode *node;
-                               struct ospf_redist *red;
-
-                               if (x == ZEBRA_ROUTE_OSPF6)
-                                       continue;
-
-                               red_list = oi->ospf->redist[x];
-                               if (!red_list)
-                                       continue;
-
-                               for (ALL_LIST_ELEMENTS_RO(red_list, node, red))
-                                       ospf_external_lsa_refresh_type(
-                                               oi->ospf, x, red->instance,
-                                               force);
-                       }
-                       /* XXX: Clearly some thing is wrong with refresh of
-                        * external LSAs
-                        * this added to hack around defaults not refreshing
-                        * after a timer
-                        * jump.
-                        */
-                       ospf_external_lsa_refresh_default(oi->ospf);
                } else {
                        oi->full_nbrs--;
                        oi->area->full_nbrs--;