Merge pull request #3892 from vivek-cumulus/evpn_vrf_route_leak

[mirror_frr.git] / bgpd / bgp_mplsvpn.c

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 2d3ff8b69564d67b43a5435fcdd4a40b44e46f7c..35634c9ec18aa0c1540e2991e487d1e701579347 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -1094,8 +1094,6 @@ vpn_leak_to_vrf_update_onevrf(struct bgp *bgp_vrf,            /* to */
         */
        uint8_t nhfamily = NEXTHOP_FAMILY(path_vpn->attr->mp_nexthop_len);
 
-       if (nhfamily != AF_UNSPEC)
-               static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP);
        memset(&nexthop_orig, 0, sizeof(nexthop_orig));
        nexthop_orig.family = nhfamily;
 
@@ -1115,6 +1113,7 @@ vpn_leak_to_vrf_update_onevrf(struct bgp *bgp_vrf,            /* to */
                        static_attr.mp_nexthop_len =
                                path_vpn->attr->mp_nexthop_len;
                }
+               static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP);
                break;
        case AF_INET6:
                /* save */