Merge pull request #13509 from pguibert6WIND/bgp_nht_other_if_cases

bgpd: upon if up event, evaluate bnc with matching nexthop

diff --cc bgpd/bgp_nht.c
index d7b14298815906f13374302195d5a60791083f8c,83a7fbd412e877eddd6d34c34a4ce2a10a15ace4..636ea06a20bdcfa696d03057ab178e86860ff552
--- 1/bgpd/bgp_nht.c
--- 2/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@@ -547,10 -551,10 +551,10 @@@ static void bgp_process_nexthop_update(
                char bnc_buf[BNC_FLAG_DUMP_SIZE];
  
                zlog_debug(
 -                      "%s(%u): Rcvd NH update %pFX(%u)%u) - metric %d/%d #nhops %d/%d flags %s",
 +                      "%s(%u): Rcvd NH update %pFX(%u)(%u) - metric %d/%d #nhops %d/%d flags %s",
                        bnc->bgp->name_pretty, bnc->bgp->vrf_id, &nhr->prefix,
-                       bnc->ifindex, bnc->srte_color, nhr->metric, bnc->metric,
-                       nhr->nexthop_num, bnc->nexthop_num,
+                       bnc->ifindex_ipv6_ll, bnc->srte_color, nhr->metric,
+                       bnc->metric, nhr->nexthop_num, bnc->nexthop_num,
                        bgp_nexthop_dump_bnc_flags(bnc, bnc_buf,
                                                   sizeof(bnc_buf)));
        }