From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 23 Jul 2015 00:20:41 +0000 (-0700)
Subject: Fix bgp_route.c missing code
X-Git-Tag: frr-2.0-rc1~1299
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=43fdf718a25be053d6e36c8d0aecfaddc2a155cf;p=mirror%2Ffrr.git

Fix bgp_route.c missing code
---

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);
         }