From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 10 Oct 2023 20:45:24 +0000 (-0400)
Subject: Revert "bgpd: accept bgp link-state capability"
X-Git-Tag: base_10.0~373^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a4fcdc4e48460dc067b0ff8f4dab20bf18fe9694;p=mirror%2Ffrr.git

Revert "bgpd: accept bgp link-state capability"

This reverts commit 67fe40676eb4e2ca78a41ddd70887af09b29fd9d.
---

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 8a202b480a..207a73801b 100644
--- 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 4c254e163e..24df8864d3 100644
--- 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