diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-10-10 16:45:32 -0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-10-11 05:02:53 +0000 |
| commit | 9b3be70d9ee7d358d34450242a4c367216c0f853 (patch) | |
| tree | 05c170e61c98e1afc9b8b760b55df6690650b721 /bgpd/bgpd.h | |
| parent | f98f17d83aefb67dc7d7e72561503de588e6319b (diff) | |
Revert "bgpd: add bgp link-state address-family configuration context"
This reverts commit ae2f3bb5b4eed01df1f7a69c7710c9be519390f6.
(cherry picked from commit ddd96b51b06e7cd5ff5471aa6f8ddb390708b858)
Diffstat (limited to 'bgpd/bgpd.h')
| -rw-r--r-- | bgpd/bgpd.h | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 6a0a9dc919..6eba3d6aae 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -81,8 +81,6 @@ enum bgp_af_index { BGP_AF_IPV6_LBL_UNICAST, BGP_AF_IPV4_FLOWSPEC, BGP_AF_IPV6_FLOWSPEC, - BGP_AF_LINKSTATE, - BGP_AF_LINKSTATE_VPN, BGP_AF_MAX }; @@ -2554,23 +2552,7 @@ static inline int afindex(afi_t afi, safi_t safi) } break; case AFI_LINKSTATE: - switch (safi) { - case SAFI_LINKSTATE: - return BGP_AF_LINKSTATE; - case SAFI_LINKSTATE_VPN: - return BGP_AF_LINKSTATE_VPN; - case SAFI_EVPN: - case SAFI_UNICAST: - case SAFI_MULTICAST: - case SAFI_LABELED_UNICAST: - case SAFI_MPLS_VPN: - case SAFI_ENCAP: - case SAFI_FLOWSPEC: - case SAFI_UNSPEC: - case SAFI_MAX: - return BGP_AF_MAX; - } - break; + /* TODO */ case AFI_UNSPEC: case AFI_MAX: return BGP_AF_MAX; @@ -2596,9 +2578,7 @@ static inline int peer_afi_active_nego(const struct peer *peer, afi_t afi) || peer->afc_nego[afi][SAFI_MPLS_VPN] || peer->afc_nego[afi][SAFI_ENCAP] || peer->afc_nego[afi][SAFI_FLOWSPEC] - || peer->afc_nego[afi][SAFI_EVPN] - || peer->afc_nego[afi][SAFI_LINKSTATE] - || peer->afc_nego[afi][SAFI_LINKSTATE_VPN]) + || peer->afc_nego[afi][SAFI_EVPN]) return 1; return 0; } @@ -2618,9 +2598,7 @@ static inline int peer_group_af_configured(struct peer_group *group) || peer->afc[AFI_IP6][SAFI_MPLS_VPN] || peer->afc[AFI_IP6][SAFI_ENCAP] || peer->afc[AFI_IP6][SAFI_FLOWSPEC] - || peer->afc[AFI_L2VPN][SAFI_EVPN] - || peer->afc[AFI_LINKSTATE][SAFI_LINKSTATE] - || peer->afc[AFI_LINKSTATE][SAFI_LINKSTATE_VPN]) + || peer->afc[AFI_L2VPN][SAFI_EVPN]) return 1; return 0; } |