Merge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_multipath

Unequal cost multipath (a.ka. weighted ECMP) with BGP link-bandwidth

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_attr.h
Simple merge

diff --cc bgpd/bgp_route.c
index 7aea1fec1447137fbe7cc2a9ebaee2522812db5a,2009375c8934a4947115b142de9de691fdc7945d..a11e1d7c693c2be0c141ac9a1bde7ff327452cc3
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2613,9 -2640,10 +2640,10 @@@ static void bgp_process_main_one(struc
                bgp_path_info_set_flag(rn, new_select, BGP_PATH_SELECTED);
                bgp_path_info_unset_flag(rn, new_select, BGP_PATH_ATTR_CHANGED);
                UNSET_FLAG(new_select->flags, BGP_PATH_MULTIPATH_CHG);
+               UNSET_FLAG(new_select->flags, BGP_PATH_LINK_BW_CHG);
        }
  
 -#if ENABLE_BGP_VNC
 +#ifdef ENABLE_BGP_VNC
        if ((afi == AFI_IP || afi == AFI_IP6) && (safi == SAFI_UNICAST)) {
                if (old_select != new_select) {
                        if (old_select) {

diff --cc bgpd/bgp_route.h
Simple merge

diff --cc bgpd/bgp_routemap.c
index 8bc4ef6893fc5feb07817a762ac3348c46b0e017,eec6b3470b7851881b535e279e923454554a8679..758141c9f25f7f2ad9a7e31d3120cc20181f9ce3
--- 1/bgpd/bgp_routemap.c
--- 2/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@@ -63,8 -63,9 +63,9 @@@
  #include "bgpd/bgp_pbr.h"
  #include "bgpd/bgp_flowspec_util.h"
  #include "bgpd/bgp_encap_types.h"
+ #include "bgpd/bgp_mpath.h"
  
 -#if ENABLE_BGP_VNC
 +#ifdef ENABLE_BGP_VNC
  #include "bgpd/rfapi/bgp_rfapi_cfg.h"
  #endif
  

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge