From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 May 2015 14:00:02 +0000 (-0700)
Subject: Fixup 'force' -vs- 'all' compile issue
X-Git-Tag: frr-2.0-rc1~1356
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d998c0f7138e7b4ecdd49dbbc8257bc13cebde35;p=matthieu%2Ffrr.git

Fixup 'force' -vs- 'all' compile issue

Our code implemented 'force' for a keyword while quagga mainline implemented 'all'.
This fixups the #define usage that was missed that came in during one of the patch
files.  This is a compile only testing

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 7ffb35c1b1..b1061e96ff 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1480,7 +1480,7 @@ subgroup_announce_check (struct bgp_info *ri, struct update_subgroup *subgrp,
         {
           if (!reflect ||
               CHECK_FLAG (peer->af_flags[afi][safi],
-                          PEER_FLAG_FORCE_NEXTHOP_SELF))
+                          PEER_FLAG_NEXTHOP_SELF_ALL))
             subgroup_announce_reset_nhop (p->family, attr);
         }
       else if (peer->sort == BGP_PEER_EBGP)