From: Russ White <russ@riw.us>
Date: Fri, 29 Jun 2018 22:18:34 +0000 (-0400)
Subject: Merge pull request #2582 from donaldsharp/work_smarter_not_slower
X-Git-Tag: frr-6.1-dev~214
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=53792a0b72370c6cfdfd3ea51c9122dd643e8aad;p=matthieu%2Ffrr.git

Merge pull request #2582 from donaldsharp/work_smarter_not_slower

bgpd: Remove HAVE_CUMULUS from evpn commands
---

53792a0b72370c6cfdfd3ea51c9122dd643e8aad
diff --cc bgpd/bgp_evpn.c
index 480c7bc63a,8137cb6a8e..959418658c
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@@ -4242,8 -4242,9 +4242,9 @@@ void bgp_evpn_unconfigure_import_rt_for
  	if (node_to_del)
  		list_delete_node(bgp_vrf->vrf_import_rtl, node_to_del);
  
+ 	assert(bgp_vrf->vrf_import_rtl);
  	/* fallback to auto import rt, if this was the last RT */
 -	if (list_isempty(bgp_vrf->vrf_import_rtl)) {
 +	if (bgp_vrf->vrf_import_rtl && list_isempty(bgp_vrf->vrf_import_rtl)) {
  		UNSET_FLAG(bgp_vrf->vrf_flags, BGP_VRF_IMPORT_RT_CFGD);
  		evpn_auto_rt_import_add_for_vrf(bgp_vrf);
  	}