Revert "bgpd: accept bgp link-state capability"

This reverts commit 67fe40676eb4e2ca78a41ddd70887af09b29fd9d.

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 8a202b480ae3c74f1e46453b9ef846c1a60f9e67..207a73801b7eff32ab65305041728c7191215c50 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -1441,8 +1441,7 @@ int bgp_open_option_parse(struct peer *peer, uint16_t length,
                    && !peer->afc_nego[AFI_IP6][SAFI_MPLS_VPN]
                    && !peer->afc_nego[AFI_IP6][SAFI_ENCAP]
                    && !peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC]
-                   && !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]
-                   && !peer->afc_nego[AFI_LINKSTATE][SAFI_LINKSTATE]) {
+                   && !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]) {
                        flog_err(EC_BGP_PKT_OPEN,
                                 "%s [Error] Configured AFI/SAFIs do not overlap with received MP capabilities",
                                 peer->host);

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 4c254e163e3832a9a84cc1ff66ad15ad2a357777..24df8864d31c172fe898fdc1563511e7c7b14a57 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1896,8 +1896,6 @@ static int bgp_open_receive(struct peer_connection *connection,
                        peer->afc[AFI_L2VPN][SAFI_EVPN];
                peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC] =
                        peer->afc[AFI_IP6][SAFI_FLOWSPEC];
-               peer->afc_nego[AFI_LINKSTATE][SAFI_LINKSTATE] =
-                       peer->afc[AFI_LINKSTATE][SAFI_LINKSTATE];
        }
 
        /* Verify valid local address present based on negotiated