bgpd: remove unnecessary check for evpn

Since `bgp->vnihash` is naturally non-NULL, remove check for this field.

Signed-off-by: anlan_cs <vic.lan@pica8.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 32dc2a785f9e62c4c9492a1583f7f249d4bbd633..d94dcdd362cb349227f33936e26a3595d4e4130e 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -2256,9 +2256,6 @@ static struct bgpevpn *evpn_create_update_vni(struct bgp *bgp, vni_t vni)
        struct bgpevpn *vpn;
        struct in_addr mcast_grp = {INADDR_ANY};
 
-       if (!bgp->vnihash)
-               return NULL;
-
        vpn = bgp_evpn_lookup_vni(bgp, vni);
        if (!vpn) {
                /* Check if this L2VNI is already configured as L3VNI */
@@ -2290,8 +2287,6 @@ static struct bgpevpn *evpn_create_update_vni(struct bgp *bgp, vni_t vni)
  */
 static void evpn_delete_vni(struct bgp *bgp, struct bgpevpn *vpn)
 {
-       assert(bgp->vnihash);
-
        if (!is_vni_live(vpn)) {
                bgp_evpn_free(bgp, vpn);
                return;
@@ -6291,7 +6286,7 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
        if (bgp->advertise_all_vni)
                vty_out(vty, "  advertise-all-vni\n");
 
-       if (bgp->vnihash) {
+       if (hashcount(bgp->vnihash)) {
                struct list *vnilist = hash_to_list(bgp->vnihash);
                struct listnode *ln;
                struct bgpevpn *data;

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 4a3688be27a1caa53100f341955279e9eb28c2e3..5abd6fc4fc2e4a12b5cc851b89890bbc624fb9a7 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1554,7 +1554,7 @@ DEFUN (no_router_bgp,
                                                BGP_L2VPN_EVPN_ADV_IPV6_UNICAST) ||
                                     CHECK_FLAG(tmp_bgp->af_flags[AFI_L2VPN][SAFI_EVPN],
                                                BGP_L2VPN_EVPN_ADV_IPV6_UNICAST_GW_IP))) ||
-                                   (tmp_bgp->vnihash && hashcount(tmp_bgp->vnihash))) {
+                                   (hashcount(tmp_bgp->vnihash))) {
                                        vty_out(vty,
                                                "%% Cannot delete default BGP instance. Dependent VRF instances exist\n");
                                        return CMD_WARNING_CONFIG_FAILED;