From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 29 Jun 2018 00:57:36 +0000 (-0400)
Subject: bgpd: Fix some build issues from removing HAVE_CUMULUS
X-Git-Tag: frr-6.1-dev~214^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6a527b2fc167405d2efbdffbe1636f73935f1885;p=mirror_frr.git

bgpd: Fix some build issues from removing HAVE_CUMULUS

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

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index b3edfed5a..729bd87ad 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -3256,10 +3256,11 @@ DEFUN(show_bgp_l2vpn_evpn_es,
 {
 	int idx = 0;
 	uint8_t uj = 0;
-	esi_t esi = {0};
+	esi_t esi;
 	json_object *json = NULL;
 	struct bgp *bgp = NULL;
 
+	memset(&esi, 0, sizeof(esi));
 	uj = use_json(argc, argv);
 
 	bgp = bgp_get_default();
@@ -3541,10 +3542,11 @@ DEFUN(show_bgp_l2vpn_evpn_route_esi,
       JSON_STR)
 {
 	int uj = 0;
-	esi_t esi = {0};
+	esi_t esi;
 	struct bgp *bgp = NULL;
 	json_object *json = NULL;
 
+	memset(&esi, 0, sizeof(esi));
 	bgp = bgp_get_default();
 	if (!bgp)
 		return CMD_WARNING;
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index fcf983e31..7057b62f2 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8010,10 +8010,9 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct prefix *p,
 		if (binfo->extra && binfo->extra->damp_info)
 			bgp_damp_info_vty(vty, binfo, json_path);
 
-/* Remote Label */
+		/* Remote Label */
 		if (binfo->extra && bgp_is_valid_label(&binfo->extra->label[0])
-		    && safi != SAFI_EVPN)
-		{
+		    && safi != SAFI_EVPN) {
 			mpls_label_t label =
 				label_pton(&binfo->extra->label[0]);
 			if (json_paths)