From 43fdf718a25be053d6e36c8d0aecfaddc2a155cf Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 22 Jul 2015 17:20:41 -0700 Subject: [PATCH] Fix bgp_route.c missing code --- bgpd/bgp_route.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 0c4b79cf98..9e02b311e7 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1484,7 +1484,7 @@ subgroup_announce_check (struct bgp_info *ri, struct update_subgroup *subgrp, * the global nexthop here; the link-local nexthop would have been cleared * already, and if not, it is required by the update formation code. * Also see earlier comments in this function. - */ + */ /* * If route-map has performed some operation on the nexthop or the peer * configuration says to pass it unchanged, we cannot reset the nexthop @@ -1496,14 +1496,13 @@ subgroup_announce_check (struct bgp_info *ri, struct update_subgroup *subgrp, riattr->rmap_change_flags) && !transparent && !CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_NEXTHOP_UNCHANGED)) - { /* We can reset the nexthop, if setting (or forcing) it to 'self' */ if (CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_NEXTHOP_SELF)) { if (!reflect || CHECK_FLAG (peer->af_flags[afi][safi], - PEER_FLAG_NEXTHOP_SELF_ALL)) + PEER_FLAG_FORCE_NEXTHOP_SELF)) subgroup_announce_reset_nhop ((peer_cap_enhe(peer) ? AF_INET6 : p->family), attr); } -- 2.39.5