From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 15 Sep 2017 13:49:26 +0000 (-0400)
Subject: bgpd: Do not put on outgoing stream type 5 route 2 times
X-Git-Tag: frr-4.0-dev~306^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1184%2Fhead;p=mirror%2Ffrr.git

bgpd: Do not put on outgoing stream type 5 route 2 times

With the change to allow bgp_evpn.c to support 2,3 and 5 evpn routes
the output of the route type is being done by bgp_evpn_encode_prefix
instead of the individual route encoder functions.

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

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 8c3a1b337b..7b3a8ef098 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -2047,7 +2047,6 @@ static void evpn_mpattr_encode_type5(struct stream *s, struct prefix *p,
 		len = 8; /* ipv4 */
 	else
 		len = 32; /* ipv6 */
-	stream_putc(s, BGP_EVPN_IP_PREFIX_ROUTE);
 	/* Prefix contains RD, ESI, EthTag, IP length, IP, GWIP and VNI */
 	stream_putc(s, 8 + 10 + 4 + 1 + len + 3);
 	stream_put(s, prd->val, 8);