Merge pull request #11840 from xdxu/master

ospf6d: Don't remove summary route if it is a range

diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index 5af1139d9b484fb56b243e2873c2c8778e700282..e9c42bb80c736f11586b545b8952a919d28fc755 100644 (file)
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -488,7 +488,12 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
                                zlog_debug(
                                        "Suppressed by range %pFX of area %s",
                                        &range->prefix, route_area->name);
-                       ospf6_abr_delete_route(summary, summary_table, old);
+                       /* The existing summary route could be a range, don't
+                        * remove it in this case
+                        */
+                       if (summary && summary->type != OSPF6_DEST_TYPE_RANGE)
+                               ospf6_abr_delete_route(summary, summary_table,
+                                                      old);
                        return 0;
                }
        }