From de4d0a517cacf6c6ae0d22cd627ff84cb88382b1 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Tue, 26 Feb 2019 18:22:10 -0300 Subject: [PATCH] Revert "bgpd: in case nexthop is ipv6, set nh attribute flag in mpls vpn case" BGP IPv6 routes should never contain the NEXT_HOP attribute (MP_REACH_NLRI should be used instead). This reverts commit 75cd35c6977137a14ac37347a465d4e8a91eb4c4. Signed-off-by: Renato Westphal --- bgpd/bgp_mplsvpn.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 4baac3e57a..765170d1a5 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1092,8 +1092,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; @@ -1113,6 +1111,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 */ -- 2.39.5