]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #2582 from donaldsharp/work_smarter_not_slower
authorRuss White <russ@riw.us>
Fri, 29 Jun 2018 22:18:34 +0000 (18:18 -0400)
committerGitHub <noreply@github.com>
Fri, 29 Jun 2018 22:18:34 +0000 (18:18 -0400)
bgpd: Remove HAVE_CUMULUS from evpn commands

1  2 
bgpd/bgp_evpn.c

diff --cc bgpd/bgp_evpn.c
index 480c7bc63acdbc329e5d70c727d6c8d31d2c6325,8137cb6a8e2909386bdf02cccba50c832ef37746..959418658c9587ae8be1afcb8bcbd0ac9a1992ef
@@@ -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);
        }