Hi Ondrej,

   In bgp_create_end_mark(), suggest to add condition ext_next_hop to select ip_end_mark or mp_end_mark that is aligned with bgp_create_update function,  although this don’t affect protocols communication J

@@ -2225,7 +2297,7 @@ bgp_create_end_mark(struct bgp_channel *

   BGP_TRACE(D_PACKETS, "Sending END-OF-RIB");

-  return (c->afi == BGP_AF_IPV4) ?

+  return (c->afi == BGP_AF_IPV4) && !c->ext_next_hop ?

     bgp_create_ip_end_mark(c, buf):

     bgp_create_mp_end_mark(c, buf);

}

Best Regards,

Arvin Gan