From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 29 Aug 2017 21:48:36 +0000 (-0400)
Subject: Merge pull request #1056 from opensourcerouting/oldbits-0
X-Git-Tag: frr-4.0-dev~359
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=32592ffb4f04f18b7eacaeca3c6fc254bafbc5b3;p=mirror%2Ffrr.git

Merge pull request #1056 from opensourcerouting/oldbits-0

"pathspace" options, vtysh-suid-cleanups, "vty_frame()"
---

32592ffb4f04f18b7eacaeca3c6fc254bafbc5b3
diff --cc bgpd/bgp_evpn_vty.c
index e8e986d1fc,809ffa72ce..e414ad1e67
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@@ -47,17 -46,10 +47,12 @@@ struct vni_walk_ctx 
  	struct bgp *bgp;
  	struct vty *vty;
  	struct in_addr vtep_ip;
 +	json_object *json;
  };
  
- struct evpn_config_write {
- 	int write;
- 	struct vty *vty;
- };
- 
  #if defined(HAVE_CUMULUS)
 -static void display_import_rt(struct vty *vty, struct irt_node *irt)
 +static void display_import_rt(struct vty *vty, struct irt_node *irt,
 +			      json_object *json)
  {
  	u_char *pnt;
  	u_char type, sub_type;