Merge pull request #3502 from donaldsharp/socket_to_me_baby

[mirror_frr.git] / bgpd / bgp_open.c

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 62b412af0ca58077bf39d01bf6319e32c0993e8b..3018124f452053c9a6af3c46743cb654fbec443f 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -1331,7 +1331,6 @@ void bgp_open_capability(struct stream *s, struct peer *peer)
                         */
                        if (CHECK_FLAG(peer->flags, PEER_FLAG_CAPABILITY_ENHE)
                            && peer->su.sa.sa_family == AF_INET6
-                           && IN6_IS_ADDR_LINKLOCAL(&peer->su.sin6.sin6_addr)
                            && afi == AFI_IP
                            && (safi == SAFI_UNICAST
                                || safi == SAFI_LABELED_UNICAST)) {
@@ -1388,10 +1387,7 @@ void bgp_open_capability(struct stream *s, struct peer *peer)
                        /* Only advertise addpath TX if a feature that
                         * will use it is
                         * configured */
-                       if (CHECK_FLAG(peer->af_flags[afi][safi],
-                                      PEER_FLAG_ADDPATH_TX_ALL_PATHS)
-                           || CHECK_FLAG(peer->af_flags[afi][safi],
-                                         PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS))
+                       if (peer->addpath_type[afi][safi] != BGP_ADDPATH_NONE)
                                adv_addpath_tx = 1;
                }
        }