diff options
| author | Russ White <russ@riw.us> | 2022-04-13 14:55:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 14:55:29 -0400 |
| commit | 5dd323579ae708c1b01c5aeed66ea51693c38ff8 (patch) | |
| tree | 5c36129a4113b722800b1e17b089c831366573e4 | |
| parent | 6a1dbeba2f7c7e678877e16ae0e18e5a4b9aae73 (diff) | |
| parent | c2b7d418f7f3d34e4fe31794c1d8bd09d0bedf53 (diff) | |
Merge pull request #11025 from anlancs/bgpd-remove-l3nhg-control
bgpd: remove unnecessary l3nhg knob for evpn-mh
| -rw-r--r-- | bgpd/bgp_evpn_mh.c | 3 | ||||
| -rw-r--r-- | bgpd/bgp_evpn_mh.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c index d3460674be..e82fef8c1a 100644 --- a/bgpd/bgp_evpn_mh.c +++ b/bgpd/bgp_evpn_mh.c @@ -2869,7 +2869,7 @@ static void bgp_evpn_l3nhg_zebra_add_v4_or_v6(struct bgp_evpn_es_vrf *es_vrf, static bool bgp_evpn_l3nhg_zebra_ok(struct bgp_evpn_es_vrf *es_vrf) { - if (!bgp_mh_info->host_routes_use_l3nhg && !bgp_mh_info->install_l3nhg) + if (!bgp_mh_info->host_routes_use_l3nhg) return false; /* Check socket. */ @@ -4942,7 +4942,6 @@ void bgp_evpn_mh_init(void) /* config knobs - XXX add cli to control it */ bgp_mh_info->ead_evi_adv_for_down_links = true; bgp_mh_info->consistency_checking = true; - bgp_mh_info->install_l3nhg = false; bgp_mh_info->host_routes_use_l3nhg = BGP_EVPN_MH_USE_ES_L3NHG_DEF; bgp_mh_info->suppress_l3_ecomm_on_inactive_es = true; bgp_mh_info->bgp_evpn_nh_setup = true; diff --git a/bgpd/bgp_evpn_mh.h b/bgpd/bgp_evpn_mh.h index d9e2e72e4f..2e2e4231e6 100644 --- a/bgpd/bgp_evpn_mh.h +++ b/bgpd/bgp_evpn_mh.h @@ -319,7 +319,6 @@ struct bgp_evpn_mh_info { /* Enable ES consistency checking */ bool consistency_checking; /* Use L3 NHGs for host routes in symmetric IRB */ - bool install_l3nhg; bool host_routes_use_l3nhg; /* Some vendors are not generating the EAD-per-EVI route. This knob * can be turned off to activate a remote ES-PE when the EAD-per-ES |