Commit edf8c3f076 for frr

commit edf8c3f076b3e521f83940c53ce1eb82a8df3c7d
Merge: c4e94c4aaa 1ecf50846d
Author: Russ White <russ@riw.us>
Date:   Sun Oct 11 17:37:56 2026 -0400

    Merge pull request #23356 from donaldsharp/final_conversion_to_dplane

    Final conversion to dplane

diff --cc zebra/zebra_nhg.c
index cba335640c,70db18c32e..15c092a036
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@@ -1892,11 -1976,10 +1974,11 @@@ void zebra_nhg_decrement_ref(struct nhg

  	nhe->refcnt--;

- 	if (!zebra_router_in_shutdown() && nhe->refcnt <= 0 &&
+ 	if (!zebra_router_in_shutdown() && ZEBRA_NHG_CREATED(nhe) && nhe->refcnt <= 0 &&
  	    (CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED) ||
  	     CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_QUEUED)) &&
 -	    !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND)) {
 +	    !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND) &&
 +	    !unrefreshed_stale_fdb) {
  		nhe->refcnt = 1;
  		SET_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND);
  		event_add_timer(zrouter.master, zebra_nhg_timer, nhe,